Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel

1 files changed, 27 insertions, 0 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index f53c58290543..b121b6053cce 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -49,6 +49,33 @@
 1002:
                 .endm
 
+#elif defined(CONFIG_CPU_XSCALE)
+
+                .macro  addruart, rx
+                .endm
+
+                .macro  senduart, rd, rx
+                mcr     p14, 0, \rd, c8, c0, 0
+                .endm
+
+                .macro  busyuart, rd, rx
+1001:
+                mrc     p14, 0, \rx, c14, c0, 0
+                tst     \rx, #0x10000000
+                beq     1001b
+                .endm
+
+                .macro  waituart, rd, rx
+                mov     \rd, #0x10000000
+1001:
+                subs    \rd, \rd, #1
+                bmi     1002f
+                mrc     p14, 0, \rx, c14, c0, 0
+                tst     \rx, #0x10000000
+                bne     1001b
+1002:
+                .endm
+
 #else
 
                 .macro  addruart, rx