From: Ben Dooks <ben.dooks@codethink.co.uk>
Date: Wed, 18 Nov 2015 14:41:16 +0000 (+0000)
Subject: ARM: meson: serial: use meson_uart_tx_empty() to wait for empty
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f1f5c1400f7907a1b52be94cabe8992b480785cf;p=linux.git

ARM: meson: serial: use meson_uart_tx_empty() to wait for empty

Use the meson_uart_tx_empty() instead of a direct read of the status
register. This is easier to read and will ensure the UART's transmit
state machine is idle when trying to update the baud rate.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 9327efd889180..d3f2c967906cf 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -285,7 +285,7 @@ static void meson_uart_change_speed(struct uart_port *port, unsigned long baud)
 {
 	u32 val;
 
-	while (!(readl(port->membase + AML_UART_STATUS) & AML_UART_TX_EMPTY))
+	while (!meson_uart_tx_empty(port))
 		cpu_relax();
 
 	val = readl(port->membase + AML_UART_REG5);