diff options
| author | Rabin Vincent | 2010-12-08 06:37:57 +0100 |
|---|---|---|
| committer | Linus Walleij | 2011-01-10 18:34:52 +0100 |
| commit | 92389ca8362c42952c7ebb8a0350ac522dcde0f4 (patch) | |
| tree | 6c840e0d706712729bded5900aed93fa70778ca2 /arch/arm/mach-ux500/cpu-db5500.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff) | |
| download | kernel-qcow2-linux-92389ca8362c42952c7ebb8a0350ac522dcde0f4.tar.gz kernel-qcow2-linux-92389ca8362c42952c7ebb8a0350ac522dcde0f4.tar.xz kernel-qcow2-linux-92389ca8362c42952c7ebb8a0350ac522dcde0f4.zip | |
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-db5500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db5500.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c index acc841e48de4..7b0ab8336f3f 100644 --- 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)); } |