aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/cpu-db8500.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-12-08 00:37:57 -0500
committerLinus Walleij <linus.walleij@stericsson.com>2011-01-10 12:34:52 -0500
commit92389ca8362c42952c7ebb8a0350ac522dcde0f4 (patch)
tree6c840e0d706712729bded5900aed93fa70778ca2 /arch/arm/mach-ux500/cpu-db8500.c
parent0c21e3aaf6ae85bee804a325aa29c325209180fd (diff)
ux500: remove build-time changing macros
To allow the possiblity of building U8500 and U5500 support in the same image. Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> [Rebased to latest changes in Russells tree] Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index c0f34a404c5..1b2b81c0f27 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -30,6 +30,22 @@ static struct platform_device *platform_devs[] __initdata = {
30 30
31/* minimum static i/o mapping required to boot U8500 platforms */ 31/* minimum static i/o mapping required to boot U8500 platforms */
32static struct map_desc u8500_io_desc[] __initdata = { 32static struct map_desc u8500_io_desc[] __initdata = {
33 __IO_DEV_DESC(U8500_UART0_BASE, SZ_4K),
34 __IO_DEV_DESC(U8500_UART2_BASE, SZ_4K),
35 __IO_DEV_DESC(U8500_GIC_CPU_BASE, SZ_4K),
36 __IO_DEV_DESC(U8500_GIC_DIST_BASE, SZ_4K),
37 __IO_DEV_DESC(U8500_L2CC_BASE, SZ_4K),
38 __IO_DEV_DESC(U8500_TWD_BASE, SZ_4K),
39 __IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),
40 __IO_DEV_DESC(U8500_SCU_BASE, SZ_4K),
41 __IO_DEV_DESC(U8500_BACKUPRAM0_BASE, SZ_8K),
42
43 __IO_DEV_DESC(U8500_CLKRST1_BASE, SZ_4K),
44 __IO_DEV_DESC(U8500_CLKRST2_BASE, SZ_4K),
45 __IO_DEV_DESC(U8500_CLKRST3_BASE, SZ_4K),
46 __IO_DEV_DESC(U8500_CLKRST5_BASE, SZ_4K),
47 __IO_DEV_DESC(U8500_CLKRST6_BASE, SZ_4K),
48
33 __IO_DEV_DESC(U8500_PRCMU_BASE, SZ_4K), 49 __IO_DEV_DESC(U8500_PRCMU_BASE, SZ_4K),
34 __IO_DEV_DESC(U8500_GPIO0_BASE, SZ_4K), 50 __IO_DEV_DESC(U8500_GPIO0_BASE, SZ_4K),
35 __IO_DEV_DESC(U8500_GPIO1_BASE, SZ_4K), 51 __IO_DEV_DESC(U8500_GPIO1_BASE, SZ_4K),
@@ -117,8 +133,6 @@ bool cpu_is_u8500v20(void)
117 133
118void __init u8500_map_io(void) 134void __init u8500_map_io(void)
119{ 135{
120 ux500_map_io();
121
122 iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc)); 136 iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));
123 137
124 if (cpu_is_u8500ed()) 138 if (cpu_is_u8500ed())