diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2010-10-10 20:20:19 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-12-16 01:31:15 -0500 |
commit | 851982c1b6ca18cedf6d01e4529a0c1ddb30771e (patch) | |
tree | 08438d74fabb2ce7a4fa0abd97b18b7b59c54f6f /arch/arm/mach-pxa/stargate2.c | |
parent | 64ed267bdac799485a938dd2cba8243ba383cd5f (diff) |
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.c | 4 |
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) | |||
998 | 998 | ||
999 | #ifdef CONFIG_MACH_INTELMOTE2 | 999 | #ifdef CONFIG_MACH_INTELMOTE2 |
1000 | MACHINE_START(INTELMOTE2, "IMOTE 2") | 1000 | MACHINE_START(INTELMOTE2, "IMOTE 2") |
1001 | .map_io = pxa_map_io, | 1001 | .map_io = pxa27x_map_io, |
1002 | .init_irq = pxa27x_init_irq, | 1002 | .init_irq = pxa27x_init_irq, |
1003 | .timer = &pxa_timer, | 1003 | .timer = &pxa_timer, |
1004 | .init_machine = imote2_init, | 1004 | .init_machine = imote2_init, |
@@ -1008,7 +1008,7 @@ MACHINE_END | |||
1008 | 1008 | ||
1009 | #ifdef CONFIG_MACH_STARGATE2 | 1009 | #ifdef CONFIG_MACH_STARGATE2 |
1010 | MACHINE_START(STARGATE2, "Stargate 2") | 1010 | MACHINE_START(STARGATE2, "Stargate 2") |
1011 | .map_io = pxa_map_io, | 1011 | .map_io = pxa27x_map_io, |
1012 | .nr_irqs = STARGATE_NR_IRQS, | 1012 | .nr_irqs = STARGATE_NR_IRQS, |
1013 | .init_irq = pxa27x_init_irq, | 1013 | .init_irq = pxa27x_init_irq, |
1014 | .timer = &pxa_timer, | 1014 | .timer = &pxa_timer, |