diff mbox series

[2/3] serial: uniphier: flush transmitter before changing hardware settings

Message ID 20200709161208.223814-2-yamada.masahiro@socionext.com
State Accepted
Commit 26f7a7deab33e9fb46abec50a5209878fc3b53dc
Headers show
Series [1/3] serial: uniphier: use register macros instead of structure | expand

Commit Message

Masahiro Yamada July 9, 2020, 4:12 p.m. UTC 
Ensure the transmitter is empty when chaining the baudrate or any
hardware settings. If a character is remaining in the transmitter,
the console will be garbled.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 drivers/serial/serial_uniphier.c | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 2ffab004bd..aaf8657ee1 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -43,6 +43,10 @@  static int uniphier_serial_setbrg(struct udevice *dev, int baudrate)
 
 	divisor = DIV_ROUND_CLOSEST(priv->uartclk, mode_x_div * baudrate);
 
+	/* flush the trasmitter before changing hw setting */
+	while (!(readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_TEMT))
+		;
+
 	writel(divisor, priv->membase + UNIPHIER_UART_DLR);
 
 	return 0;
@@ -132,6 +136,10 @@  static int uniphier_serial_probe(struct udevice *dev)
 
 	priv->uartclk = clk_data->clk_rate;
 
+	/* flush the trasmitter empty before changing hw setting */
+	while (!(readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_TEMT))
+		;
+
 	tmp = readl(priv->membase + UNIPHIER_UART_LCR_MCR);
 	tmp &= ~UNIPHIER_UART_LCR_MASK;
 	tmp |= FIELD_PREP(UNIPHIER_UART_LCR_MASK, UART_LCR_WLEN8);