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, 5 insertions, 7 deletions

diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
index 072cc6b61ba3..507c6873b7ee 100644
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S
@@ -14,16 +14,14 @@
 #include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #CLPS7111_PHYS_BASE
-                movne   \rx, #CLPS7111_VIRT_BASE
+                .macro  addruart, rp, rv
 #ifndef CONFIG_DEBUG_CLPS711X_UART2
-                add     \rx, \rx, #0x0000       @ UART1
+                mov     \rp, #0x0000    @ UART1
 #else
-                add     \rx, \rx, #0x1000       @ UART2
+                mov     \rp, #0x1000    @ UART2
 #endif
+                orr     \rv, \rp, #CLPS7111_VIRT_BASE
+                orr     \rp, \rp, #CLPS7111_PHYS_BASE
                 .endm
 
                 .macro  senduart,rd,rx