aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-11-22 17:57:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 15:07:51 +0000
commit49db76eb5fd7d75babb4f3a5f30e86d1f8e82543 (patch)
tree4c74fe4847dc71c75d4cf1c43fe9a28f4e05a81d
parent6bc54e69921a64e8f813de658aef645c960a2904 (diff)
[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>
-rw-r--r--include/asm-arm/arch-pxa/uncompress.h9
1 files changed, 7 insertions, 2 deletions
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;
}
/*