ARM: 6078/1: ux500: add per-SoC register definitions

Split up all the hardware register definitions previously found in
hardware.h into per-SoC files db8500-regs.h and db5500-regs.h.  Rename a
couple of macros to prepare for sharing code between the variants.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-ux500/cpu-u8500.c b/arch/arm/mach-ux500/cpu-u8500.c
index 979f1c32ad09..8919af4eeeb5 100644
--- a/arch/arm/mach-ux500/cpu-u8500.c
+++ b/arch/arm/mach-ux500/cpu-u8500.c
@@ -124,10 +124,10 @@ static struct map_desc u8500_io_desc[] __initdata = {
         __IO_DEV_DESC(U8500_CLKRST3_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_CLKRST5_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_CLKRST6_BASE, SZ_4K),
+        __IO_DEV_DESC(U8500_GPIO0_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_GPIO1_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_GPIO2_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_GPIO3_BASE, SZ_4K),
-        __IO_DEV_DESC(U8500_GPIO5_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_L2CC_BASE, SZ_4K),
 };
 
@@ -137,7 +137,7 @@ static struct map_desc u8500ed_io_desc[] __initdata = {
 };
 
 static struct map_desc u8500v1_io_desc[] __initdata = {
-        __IO_DEV_DESC(U8500_MTU0_BASE_V1, SZ_4K),
+        __IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),
 };
 
 void __init u8500_map_io(void)
@@ -177,7 +177,7 @@ static void __init u8500_timer_init(void)
         if (cpu_is_u8500ed())
                 mtu_base = __io_address(U8500_MTU0_BASE_ED);
         else
-                mtu_base = __io_address(U8500_MTU0_BASE_V1);
+                mtu_base = __io_address(U8500_MTU0_BASE);
 
         nmdk_timer_init();
 }