summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-11 01:44:35 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-11 01:44:35 +0200
commite172dedd89a342b30fddfafd820d2ef40c039cea (patch)
tree1274e1b0060258ed2d70eb43a1852d741d392fb5 /arch
parentARM: initrd: disable initrds outside of memory (diff)
downloadlinux-e172dedd89a342b30fddfafd820d2ef40c039cea.tar.xz
linux-e172dedd89a342b30fddfafd820d2ef40c039cea.zip
ARM: footbridge: fix debug macros
More of the same of 5f2c1b30 (ARM: footbridge: fix debug macros), this time for the DC21285-based debugging code rather than the 8250- based debugging code. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-footbridge/include/mach/debug-macro.S5
1 files changed, 3 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 30b971d65815..1be2eeb7a0a0 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -26,6 +26,7 @@
#include <asm/hardware/debug-8250.S>
#else
+#include <mach/hardware.h>
/* For EBSA285 debugging */
.equ dc21285_high, ARMCSR_BASE & 0xff000000
.equ dc21285_low, ARMCSR_BASE & 0x00ffffff
@@ -36,8 +37,8 @@
.else
mov \rp, #0
.endif
- orr \rv, \rp, #0x42000000
- orr \rp, \rp, #dc21285_high
+ orr \rv, \rp, #dc21285_high
+ orr \rp, \rp, #0x42000000
.endm
.macro senduart,rd,rx