From 770e1a4d630b08dc465cf93638635295ffbe0343 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 22 Sep 2013 08:39:56 +0200 Subject: [PATCH] serial: do not set default baudrate at init this will be done at activation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- drivers/serial/amba-pl011.c | 4 ---- drivers/serial/atmel.c | 2 -- drivers/serial/serial_auart.c | 1 - drivers/serial/serial_clps711x.c | 3 --- drivers/serial/serial_imx.c | 1 - drivers/serial/serial_ns16550.c | 2 -- 6 files changed, 13 deletions(-) diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 0f384e597..fc7723ea8 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -163,10 +163,6 @@ int pl011_init_port (struct console_device *cdev) uart->uartclk = clk_get_rate(uart->clk); - /* - * set baud rate - */ - pl011_setbaudrate(cdev, 115200); /* ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled. */ diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 7eb10e4d6..8392e78ce 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -379,8 +379,6 @@ static int atmel_serial_init_port(struct console_device *cdev) writel(USART3_BIT(RSTRX) | USART3_BIT(RSTTX), uart->base + USART3_CR); - atmel_serial_setbaudrate(cdev, 115200); - writel(USART3_BIT(RXEN) | USART3_BIT(TXEN), uart->base + USART3_CR); writel((USART3_BF(USART_MODE, USART3_USART_MODE_NORMAL) | USART3_BF(USCLKS, USART3_USCLKS_MCK) diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c index 60a701d40..19805166b 100644 --- a/drivers/serial/serial_auart.c +++ b/drivers/serial/serial_auart.c @@ -201,7 +201,6 @@ static int auart_serial_probe(struct device_d *dev) return PTR_ERR(priv->clk); auart_serial_init_port(priv); - auart_serial_setbaudrate(cdev, CONFIG_BAUDRATE); /* Disable RTS/CTS, enable Rx, Tx, UART */ writel(BM_UARTAPP_CTRL2_RTSEN | BM_UARTAPP_CTRL2_CTSEN | diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c index 17d4c2eb9..e43d14170 100644 --- a/drivers/serial/serial_clps711x.c +++ b/drivers/serial/serial_clps711x.c @@ -58,9 +58,6 @@ static void clps711x_init_port(struct console_device *cdev) tmp |= UBRLCR_FIFOEN | UBRLCR_WRDLEN8; /* FIFO on, 8N1 mode */ writel(tmp, s->UBRLCR); - /* Set default baudrate on initialization */ - clps711x_setbaudrate(cdev, CONFIG_BAUDRATE); - /* Enable the UART */ writel(readl(SYSCON(s)) | SYSCON_UARTEN, SYSCON(s)); } diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index e99dde81d..01c7cc7fe 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -337,7 +337,6 @@ static int imx_serial_probe(struct device_d *dev) cdev->setbrg = imx_serial_setbaudrate; imx_serial_init_port(cdev); - imx_serial_setbaudrate(cdev, 115200); /* Enable UART */ val = readl(priv->regs + UCR1); diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 5ae2b7624..59b509c28 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -183,8 +183,6 @@ static void ns16550_serial_init_port(struct console_device *cdev) ns16550_write(cdev, 0x07, mdr1); /* Disable */ #endif - ns16550_setbaudrate(cdev, CONFIG_BAUDRATE); - #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS ns16550_write(cdev, 0x00, mdr1); #endif