ux500: remove build-time changing macros

[deliverable/linux.git] / arch / arm / mach-ux500 / cpu-db5500.c

diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index acc841e48de40b2f16e2a4f4145b11edf2e72697..7b0ab8336f3fc4e5ebf8784c94a8c6a3cf0d9475 100644 (file)
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -22,6 +22,16 @@
 #include "devices-db5500.h"
 
 static struct map_desc u5500_io_desc[] __initdata = {
+       __IO_DEV_DESC(U5500_UART0_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_UART2_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_GIC_CPU_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_GIC_DIST_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_L2CC_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_TWD_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_MTU0_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_SCU_BASE, SZ_4K),
+       __IO_DEV_DESC(U5500_BACKUPRAM0_BASE, SZ_8K),
+
        __IO_DEV_DESC(U5500_GPIO0_BASE, SZ_4K),
        __IO_DEV_DESC(U5500_GPIO1_BASE, SZ_4K),
        __IO_DEV_DESC(U5500_GPIO2_BASE, SZ_4K),
@@ -143,8 +153,6 @@ static void __init db5500_add_gpios(void)
 
 void __init u5500_map_io(void)
 {
-       ux500_map_io();
-
        iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc));
 }