ARM: 5932/1: ux500: fix DEBUG_LL/earlyprintk
authorRabin Vincent <rabin.vincent@stericsson.com>
Fri, 12 Feb 2010 05:23:07 +0000 (06:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Feb 2010 23:10:35 +0000 (23:10 +0000)
Add a static mapping for the UART and correct its virtual address in
debug-macro.S, to make DEBUG_LL/earlyprintk work.

Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ux500/cpu-u8500.c
arch/arm/mach-ux500/include/mach/debug-macro.S

index 5f05e5850f7162de73125305c7c124140cf93d1e..397bc1f9ed94aed1b56abfd669b55b0fa5976ae8 100644 (file)
@@ -33,6 +33,7 @@ static struct platform_device *platform_devs[] __initdata = {
 
 /* minimum static i/o mapping required to boot U8500 platforms */
 static struct map_desc u8500_io_desc[] __initdata = {
+       __IO_DEV_DESC(U8500_UART2_BASE, SZ_4K),
        __IO_DEV_DESC(U8500_GIC_CPU_BASE, SZ_4K),
        __IO_DEV_DESC(U8500_GIC_DIST_BASE, SZ_4K),
        __IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),
index 8f21b6a95dce5b13f6fc9becfe4c4606145366ee..8de225e022356d651a261bf9f1debc9eec2e9a64 100644 (file)
@@ -8,12 +8,13 @@
  * published by the Free Software Foundation.
  *
  */
+#include <mach/hardware.h>
+
        .macro  addruart,rx
        mrc     p15, 0, \rx, c1, c0
-       tst     \rx, #1                 @MMU enabled?
-       moveq   \rx, #0x80000000        @MMU off, Physical address
-       movne   \rx, #0xF0000000        @MMU on, Virtual address
-       orr     \rx, \rx, #0x7000
+       tst     \rx, #1                                 @ MMU enabled?
+       ldreq   \rx, =U8500_UART2_BASE                  @ no, physical address
+       ldrne   \rx, =IO_ADDRESS(U8500_UART2_BASE)      @ yes, virtual address
        .endm
 
 #include <asm/hardware/debug-pl01x.S>