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/raumfeld.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/raumfeld.c')
-rw-r--r-- | arch/arm/mach-pxa/raumfeld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index 4121d03ea2c3..117c703750f0 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
@@ -1085,7 +1085,7 @@ static void __init raumfeld_speaker_init(void) | |||
1085 | MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") | 1085 | MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") |
1086 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1086 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, |
1087 | .init_machine = raumfeld_controller_init, | 1087 | .init_machine = raumfeld_controller_init, |
1088 | .map_io = pxa_map_io, | 1088 | .map_io = pxa3xx_map_io, |
1089 | .init_irq = pxa3xx_init_irq, | 1089 | .init_irq = pxa3xx_init_irq, |
1090 | .timer = &pxa_timer, | 1090 | .timer = &pxa_timer, |
1091 | MACHINE_END | 1091 | MACHINE_END |
@@ -1095,7 +1095,7 @@ MACHINE_END | |||
1095 | MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") | 1095 | MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") |
1096 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1096 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, |
1097 | .init_machine = raumfeld_connector_init, | 1097 | .init_machine = raumfeld_connector_init, |
1098 | .map_io = pxa_map_io, | 1098 | .map_io = pxa3xx_map_io, |
1099 | .init_irq = pxa3xx_init_irq, | 1099 | .init_irq = pxa3xx_init_irq, |
1100 | .timer = &pxa_timer, | 1100 | .timer = &pxa_timer, |
1101 | MACHINE_END | 1101 | MACHINE_END |
@@ -1105,7 +1105,7 @@ MACHINE_END | |||
1105 | MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") | 1105 | MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") |
1106 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1106 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, |
1107 | .init_machine = raumfeld_speaker_init, | 1107 | .init_machine = raumfeld_speaker_init, |
1108 | .map_io = pxa_map_io, | 1108 | .map_io = pxa3xx_map_io, |
1109 | .init_irq = pxa3xx_init_irq, | 1109 | .init_irq = pxa3xx_init_irq, |
1110 | .timer = &pxa_timer, | 1110 | .timer = &pxa_timer, |
1111 | MACHINE_END | 1111 | MACHINE_END |