diff options
author | Jayachandran C <jayachandranc@netlogicmicro.com> | 2012-07-16 06:03:37 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-07-24 12:24:44 -0400 |
commit | 7e6507ad76a212b961d2392d22a9610be9e4e053 (patch) | |
tree | 072c293043a8d07ac92cfac238bb9d7ccd0133f9 | |
parent | 93a029325979c4baa4cb03286e628b802614b5cb (diff) |
MIPS: Netlogic: early console fix
In prom_putchar(), wait for just the TX empty bit to clear in the
UART LSR.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Cc: Florian Fainelli <florian@openwrt.org>
Patchwork: https://patchwork.linux-mips.org/patch/4112/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/netlogic/common/earlycons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/netlogic/common/earlycons.c b/arch/mips/netlogic/common/earlycons.c index f193f7b3bd81..1902fa22d277 100644 --- a/arch/mips/netlogic/common/earlycons.c +++ b/arch/mips/netlogic/common/earlycons.c | |||
@@ -54,7 +54,7 @@ void prom_putchar(char c) | |||
54 | #elif defined(CONFIG_CPU_XLR) | 54 | #elif defined(CONFIG_CPU_XLR) |
55 | uartbase = nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET); | 55 | uartbase = nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET); |
56 | #endif | 56 | #endif |
57 | while (nlm_read_reg(uartbase, UART_LSR) == 0) | 57 | while ((nlm_read_reg(uartbase, UART_LSR) & UART_LSR_THRE) == 0) |
58 | ; | 58 | ; |
59 | nlm_write_reg(uartbase, UART_TX, c); | 59 | nlm_write_reg(uartbase, UART_TX, c); |
60 | } | 60 | } |