summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-28 21:57:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-31 11:53:39 +0100
commit5f2c1b30c7f60670c8b9d1cb1ea7c818b9c743a6 (patch)
tree99dd4c64e4c770c1902cd2a22c7723de1733d9bd
parentARM: mmci: round down the bytes transferred on error (diff)
downloadlinux-5f2c1b30c7f60670c8b9d1cb1ea7c818b9c743a6.tar.xz
linux-5f2c1b30c7f60670c8b9d1cb1ea7c818b9c743a6.zip
ARM: footbridge: fix debug macros
0ea1293 (arm: return both physical and virtual addresses from addruart) changed the way the 'addruart' worked, making it return both the virt and phys addresses. Unfortunately, for footbridge, these were reversed. Fix that. Tested on Netwinder. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-footbridge/include/mach/debug-macro.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index 3c9e0c40c679..30b971d65815 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -17,8 +17,8 @@
/* For NetWinder debugging */
.macro addruart, rp, rv
mov \rp, #0x000003f8
- orr \rv, \rp, #0x7c000000 @ physical
- orr \rp, \rp, #0xff000000 @ virtual
+ orr \rv, \rp, #0xff000000 @ virtual
+ orr \rp, \rp, #0x7c000000 @ physical
.endm
#define UART_SHIFT 0