summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorMichel Jaouen <michel.jaouen@stericsson.com>2012-02-01 10:30:53 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-05-02 00:25:20 +0200
commitee9581d7adaeb2d04b01e3567e2355ceb5f43ad1 (patch)
tree086c4da851324f5b0d07e961ea61222ea6b77eeb /arch/arm/mach-ux500
parentbc71c0961c61d6082472203bfae9596899c9c896 (diff)
downloadlinux-stable-ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1.tar.gz
linux-stable-ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1.tar.bz2
linux-stable-ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1.zip
ARM: ux500: ioremap differences for DB9540
The DB9540 ASIC has bigger PRCMU and PRCMU TCDM memories, so create a separate mapping table for these. Signed-off-by: Michel Jaouen <michel.jaouen@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 0bdcdd96fdc8..b16834270880 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -49,12 +49,23 @@ static struct map_desc u8500_common_io_desc[] __initdata = {
__IO_DEV_DESC(U8500_CLKRST5_BASE, SZ_4K),
__IO_DEV_DESC(U8500_CLKRST6_BASE, SZ_4K),
- __IO_DEV_DESC(U8500_PRCMU_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),
+};
+
+/* U8500 IO map specific description */
+static struct map_desc u8500_io_desc[] __initdata = {
+ __IO_DEV_DESC(U8500_PRCMU_BASE, SZ_4K),
__IO_DEV_DESC(U8500_PRCMU_TCDM_BASE, SZ_4K),
+
+};
+
+/* U9540 IO map specific description */
+static struct map_desc u9540_io_desc[] __initdata = {
+ __IO_DEV_DESC(U8500_PRCMU_BASE, SZ_4K + SZ_8K),
+ __IO_DEV_DESC(U8500_PRCMU_TCDM_BASE, SZ_4K + SZ_8K),
};
void __init u8500_map_io(void)
@@ -68,6 +79,11 @@ void __init u8500_map_io(void)
iotable_init(u8500_common_io_desc, ARRAY_SIZE(u8500_common_io_desc));
+ if (cpu_is_u9540())
+ iotable_init(u9540_io_desc, ARRAY_SIZE(u9540_io_desc));
+ else
+ iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));
+
_PRCMU_BASE = __io_address(U8500_PRCMU_BASE);
}