From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 22 Nov 2007 16:57:30 +0000 (+0100)
Subject: [ARM] 4663/1: Only putc uncompressor output into FFUART if it was enabled by the... 
X-Git-Tag: v2.6.25-rc1~1175^2^2~47
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=49db76eb5fd7d75babb4f3a5f30e86d1f8e82543;p=linux-2.6-omap-h63xx.git

[ARM] 4663/1: Only putc uncompressor output into FFUART if it was enabled by the bootloader

Also, use existing register and bit definitions instead of numbers.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/include/asm-arm/arch-pxa/uncompress.h b/include/asm-arm/arch-pxa/uncompress.h
index 178aa2e073a..3faad53a684 100644
--- a/include/asm-arm/arch-pxa/uncompress.h
+++ b/include/asm-arm/arch-pxa/uncompress.h
@@ -9,6 +9,9 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/serial_reg.h>
+#include <asm/arch/pxa-regs.h>
+
 #define FFUART		((volatile unsigned long *)0x40100000)
 #define BTUART		((volatile unsigned long *)0x40200000)
 #define STUART		((volatile unsigned long *)0x40700000)
@@ -19,9 +22,11 @@
 
 static inline void putc(char c)
 {
-	while (!(UART[5] & 0x20))
+	if (!(UART[UART_IER] & IER_UUE))
+		return;
+	while (!(UART[UART_LSR] & LSR_TDRQ))
 		barrier();
-	UART[0] = c;
+	UART[UART_TX] = c;
 }
 
 /*