linux-mips
[Top] [All Lists]

[PATCH UPDATED 06/12] MIPS: Netlogic: early console fix

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH UPDATED 06/12] MIPS: Netlogic: early console fix
From: "Jayachandran C" <jayachandranc@netlogicmicro.com>
Date: Mon, 16 Jul 2012 15:33:37 +0530
Cc: "Florian Fainelli" <florian@openwrt.org>, "Jayachandran C" <jayachandranc@netlogicmicro.com>
In-reply-to: <2602396.OWAlsVeLic@flexo>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <2602396.OWAlsVeLic@flexo>
Sender: linux-mips-bounce@linux-mips.org
In prom_putchar(), wait for just the TX empty bit to clear in the
UART LSR.

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
[Updated to use UART_LSR_THRE instead of 0x20, as suggested by 
 Florian Fainelli <florian@openwrt.org>]

 arch/mips/netlogic/common/earlycons.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/netlogic/common/earlycons.c 
b/arch/mips/netlogic/common/earlycons.c
index f193f7b..53b200a5 100644
--- a/arch/mips/netlogic/common/earlycons.c
+++ b/arch/mips/netlogic/common/earlycons.c
@@ -54,7 +54,7 @@ void prom_putchar(char c)
 #elif defined(CONFIG_CPU_XLR)
        uartbase = nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);
 #endif
-       while (nlm_read_reg(uartbase, UART_LSR) == 0)
+       while ((nlm_read_reg(uartbase, UART_LSR) & UART_LSR_THRE) == 0)
                ;
        nlm_write_reg(uartbase, UART_TX, c);
 }
-- 
1.7.9.5



<Prev in Thread] Current Thread [Next in Thread>