[ARM] 3838/1: ARM: DCC debug console support for ARM11

Adds support for CONFIG_DEBUG_ICEDCC for ARM11.
Tested on ARM1136 (OMAP2420).

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 31 insertions, 0 deletions

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 987c44160496..75df1f764a10 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -20,11 +20,21 @@
 #ifdef DEBUG
 
 #if defined(CONFIG_DEBUG_ICEDCC)
+
+#ifdef CONFIG_CPU_V6
+                .macro  loadsp, rb
+                .endm
+                .macro  writeb, ch, rb
+                mcr     p14, 0, \ch, c0, c5, 0
+                .endm
+#else
                 .macro  loadsp, rb
                 .endm
                 .macro  writeb, ch, rb
                 mcr     p14, 0, \ch, c0, c1, 0
                 .endm
+#endif
+
 #else
 
 #include <asm/arch/debug-macro.S>
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index ace3fb5835d9..283891c736c4 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -30,6 +30,25 @@ static void putstr(const char *ptr);
 #include <asm/arch/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC
+
+#ifdef CONFIG_CPU_V6
+
+static void icedcc_putc(int ch)
+{
+        int status, i = 0x4000000;
+
+        do {
+                if (--i < 0)
+                        return;
+
+                asm volatile ("mrc p14, 0, %0, c0, c1, 0" : "=r" (status));
+        } while (status & (1 << 29));
+
+        asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
+}
+
+#else
+
 static void icedcc_putc(int ch)
 {
         int status, i = 0x4000000;
@@ -44,6 +63,8 @@ static void icedcc_putc(int ch)
         asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch));
 }
 
+#endif
+
 #define putc(ch)        icedcc_putc(ch)
 #define flush() do { } while (0)
 #endif