[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>

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index e1f6c0bbe1e74ce586d743bc091066be260e803e..da893c80d471550c59a51acbeeb31d97437c730b 100644 (file)
--- 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 83f552f7bcc142eddd9b850575a38d1ac5c3690b..c611871643a287ea08f1a37a151f765329d35b6b 100644 (file)
--- 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