Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=49db76eb5fd7d75babb4f3a5f30e86d1f8e82543
Commit:     49db76eb5fd7d75babb4f3a5f30e86d1f8e82543
Parent:     6bc54e69921a64e8f813de658aef645c960a2904
Author:     Philipp Zabel <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 22 17:57:30 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 15:07:51 2008 +0000

    [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 <[EMAIL PROTECTED]>
    Acked-by: Nicolas Pitre <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-pxa/uncompress.h |    9 +++++++--
 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 178aa2e..3faad53 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;
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to