arm: return both physical and virtual addresses from addruart

Rather than checking the MMU status in every instance of addruart, do it
once in kernel/debug.S, and change the existing addruart macros to
return both physical and virtual addresses. The main debug code can then
select the appropriate address to use.

This will also allow us to retreive the address of a uart for the MMU
state that we're not current in.

Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com>
and Tony Lindgren <tony@atomide.com>, and fix for versatile express from
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Jason Wang <jason77.wang@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 238c4f132cdb..fbd5d90dcc8c 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -20,12 +20,9 @@
 #include <mach/msm_iomap.h>
 
 #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
-        .macro  addruart, rx, tmp
-        @ see if the MMU is enabled and select appropriate base address
-        mrc     p15, 0, \rx, c1, c0
-        tst     \rx, #1
-        ldreq   \rx, =MSM_DEBUG_UART_PHYS
-        ldrne   \rx, =MSM_DEBUG_UART_BASE
+        .macro  addruart, rp, rv
+        ldr     \rp, =MSM_DEBUG_UART_PHYS
+        ldr     \rv, =MSM_DEBUG_UART_BASE
         .endm
 
         .macro  senduart,rd,rx
@@ -39,16 +36,7 @@
         tst     \rd, #0x04
         beq     1001b
         .endm
-#else
-        .macro  addruart, rx, tmp
-        .endm
-
-        .macro  senduart,rd,rx
-        .endm
-
-        .macro  waituart,rd,rx
-        .endm
-#endif
 
         .macro  busyuart,rd,rx
         .endm
+#endif