summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <sascha@saschahauer.de>2006-05-07 18:56:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-05-07 18:56:27 +0100
commit216251cff98838f2b79c53fc8a9e76884944be7d (patch)
tree7ebc33641b066c15031871c7251fdfa03559b5a2
parentf12267011d16b1722e71aa12cd3e89eb70a9edd6 (diff)
downloadop-kernel-dev-216251cff98838f2b79c53fc8a9e76884944be7d.zip
op-kernel-dev-216251cff98838f2b79c53fc8a9e76884944be7d.tar.gz
[ARM] 3501/1: i.MX: fix lowlevel debug macros
Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer <s.hauer@pengutonix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-imx/mx1ads.c2
-rw-r--r--include/asm-arm/arch-imx/debug-macro.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index e1f6c0b..da893c8 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -161,7 +161,7 @@ mx1ads_map_io(void)
MACHINE_START(MX1ADS, "Motorola MX1ADS")
/* Maintainer: Sascha Hauer, Pengutronix */
.phys_io = 0x00200000,
- .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc,
+ .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
.boot_params = 0x08000100,
.map_io = mx1ads_map_io,
.init_irq = imx_init_irq,
diff --git a/include/asm-arm/arch-imx/debug-macro.S b/include/asm-arm/arch-imx/debug-macro.S
index 83f552f..c611871 100644
--- a/include/asm-arm/arch-imx/debug-macro.S
+++ b/include/asm-arm/arch-imx/debug-macro.S
@@ -16,7 +16,7 @@
tst \rx, #1 @ MMU enabled?
moveq \rx, #0x00000000 @ physical
movne \rx, #0xe0000000 @ virtual
- orr \rx, \rx, #0x00200000
+ orreq \rx, \rx, #0x00200000 @ physical
orr \rx, \rx, #0x00006000 @ UART1 offset
.endm
OpenPOWER on IntegriCloud