serial: do not set default baudrate at init
this will be done at activation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
3b2263c865
commit
770e1a4d63
|
@ -163,10 +163,6 @@ int pl011_init_port (struct console_device *cdev)
|
||||||
|
|
||||||
uart->uartclk = clk_get_rate(uart->clk);
|
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.
|
** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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);
|
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_BIT(RXEN) | USART3_BIT(TXEN), uart->base + USART3_CR);
|
||||||
writel((USART3_BF(USART_MODE, USART3_USART_MODE_NORMAL)
|
writel((USART3_BF(USART_MODE, USART3_USART_MODE_NORMAL)
|
||||||
| USART3_BF(USCLKS, USART3_USCLKS_MCK)
|
| USART3_BF(USCLKS, USART3_USCLKS_MCK)
|
||||||
|
|
|
@ -201,7 +201,6 @@ static int auart_serial_probe(struct device_d *dev)
|
||||||
return PTR_ERR(priv->clk);
|
return PTR_ERR(priv->clk);
|
||||||
|
|
||||||
auart_serial_init_port(priv);
|
auart_serial_init_port(priv);
|
||||||
auart_serial_setbaudrate(cdev, CONFIG_BAUDRATE);
|
|
||||||
|
|
||||||
/* Disable RTS/CTS, enable Rx, Tx, UART */
|
/* Disable RTS/CTS, enable Rx, Tx, UART */
|
||||||
writel(BM_UARTAPP_CTRL2_RTSEN | BM_UARTAPP_CTRL2_CTSEN |
|
writel(BM_UARTAPP_CTRL2_RTSEN | BM_UARTAPP_CTRL2_CTSEN |
|
||||||
|
|
|
@ -58,9 +58,6 @@ static void clps711x_init_port(struct console_device *cdev)
|
||||||
tmp |= UBRLCR_FIFOEN | UBRLCR_WRDLEN8; /* FIFO on, 8N1 mode */
|
tmp |= UBRLCR_FIFOEN | UBRLCR_WRDLEN8; /* FIFO on, 8N1 mode */
|
||||||
writel(tmp, s->UBRLCR);
|
writel(tmp, s->UBRLCR);
|
||||||
|
|
||||||
/* Set default baudrate on initialization */
|
|
||||||
clps711x_setbaudrate(cdev, CONFIG_BAUDRATE);
|
|
||||||
|
|
||||||
/* Enable the UART */
|
/* Enable the UART */
|
||||||
writel(readl(SYSCON(s)) | SYSCON_UARTEN, SYSCON(s));
|
writel(readl(SYSCON(s)) | SYSCON_UARTEN, SYSCON(s));
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,7 +337,6 @@ static int imx_serial_probe(struct device_d *dev)
|
||||||
cdev->setbrg = imx_serial_setbaudrate;
|
cdev->setbrg = imx_serial_setbaudrate;
|
||||||
|
|
||||||
imx_serial_init_port(cdev);
|
imx_serial_init_port(cdev);
|
||||||
imx_serial_setbaudrate(cdev, 115200);
|
|
||||||
|
|
||||||
/* Enable UART */
|
/* Enable UART */
|
||||||
val = readl(priv->regs + UCR1);
|
val = readl(priv->regs + UCR1);
|
||||||
|
|
|
@ -183,8 +183,6 @@ static void ns16550_serial_init_port(struct console_device *cdev)
|
||||||
ns16550_write(cdev, 0x07, mdr1); /* Disable */
|
ns16550_write(cdev, 0x07, mdr1); /* Disable */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ns16550_setbaudrate(cdev, CONFIG_BAUDRATE);
|
|
||||||
|
|
||||||
#ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
|
#ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
|
||||||
ns16550_write(cdev, 0x00, mdr1);
|
ns16550_write(cdev, 0x00, mdr1);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue