diff options
| author | Sascha Hauer <sascha@saschahauer.de> | 2006-05-07 19:56:27 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-05-07 19:56:27 +0200 |
| commit | 216251cff98838f2b79c53fc8a9e76884944be7d (patch) | |
| tree | 7ebc33641b066c15031871c7251fdfa03559b5a2 | |
| parent | [ARM] rtc-sa1100: fix compiler warnings and error cleanup (diff) | |
| download | linux-216251cff98838f2b79c53fc8a9e76884944be7d.tar.xz linux-216251cff98838f2b79c53fc8a9e76884944be7d.zip | |
[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.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-imx/debug-macro.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index e1f6c0bbe1e7..da893c80d471 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 83f552f7bcc1..c611871643a2 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 |