summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/stargate2.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-10-11 02:20:19 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-12-16 14:31:15 +0800
commit851982c1b6ca18cedf6d01e4529a0c1ddb30771e (patch)
tree08438d74fabb2ce7a4fa0abd97b18b7b59c54f6f /arch/arm/mach-pxa/stargate2.c
parent64ed267bdac799485a938dd2cba8243ba383cd5f (diff)
downloadlinux-851982c1b6ca18cedf6d01e4529a0c1ddb30771e.tar.gz
linux-851982c1b6ca18cedf6d01e4529a0c1ddb30771e.tar.bz2
linux-851982c1b6ca18cedf6d01e4529a0c1ddb30771e.zip
ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io()
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA25x/PXA27x and PXA3xx memory mapping. Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io() and pxa3xx_map_io() is included. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/stargate2.c')
-rw-r--r--arch/arm/mach-pxa/stargate2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 738adc1773fd..19f5378e766d 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -998,7 +998,7 @@ static void __init stargate2_init(void)
#ifdef CONFIG_MACH_INTELMOTE2
MACHINE_START(INTELMOTE2, "IMOTE 2")
- .map_io = pxa_map_io,
+ .map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = imote2_init,
@@ -1008,7 +1008,7 @@ MACHINE_END
#ifdef CONFIG_MACH_STARGATE2
MACHINE_START(STARGATE2, "Stargate 2")
- .map_io = pxa_map_io,
+ .map_io = pxa27x_map_io,
.nr_irqs = STARGATE_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,