[ARM PATCH] 1887/1: Update OMAP low level debug functions again

Patch from Tony Lindgren

This patch makes the low level debug functions work when support is
compiled in for multiple OMAPs. The patch also removes now unnecessary
include, incorrect comment, and SERIAL_REG_SHIFT ifdefs.

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 92514c72c08635428f7ef1fe16f56551df1a90c3..2ae6eae420e48d804cfc661700c4ce99a7c3388c 100644 (file)
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -492,14 +492,6 @@
 
 #elif defined(CONFIG_ARCH_OMAP)
 
-#include <asm/arch/serial.h>
-
-#ifdef CONFIG_ARCH_OMAP730
-#define OMAP_SERIAL_REG_SHIFT  0
-#else
-#define OMAP_SERIAL_REG_SHIFT  2
-#endif
-               /* See also __create_page_tables in head.S */
                .macro  addruart,rx
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1                 @ MMU enabled?
@@ -519,10 +511,15 @@
                .endm
 
                .macro  busyuart,rd,rx
-1002:          ldrb    \rd, [\rx, #(0x5 << OMAP_SERIAL_REG_SHIFT)]
+1001:          ldrb    \rd, [\rx, #(0x5 << 2)] @ OMAP-1510 and friends
                and     \rd, \rd, #0x60
                teq     \rd, #0x60
-               bne     1002b
+               beq     1002f
+               ldrb    \rd, [\rx, #(0x5 << 0)] @ OMAP-730 only
+               and     \rd, \rd, #0x60
+               teq     \rd, #0x60
+               bne     1001b
+1002:
                .endm
 
                .macro  waituart,rd,rx