diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2010-10-11 02:20:19 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-12-16 14:31:15 +0800 |
| commit | 851982c1b6ca18cedf6d01e4529a0c1ddb30771e (patch) | |
| tree | 08438d74fabb2ce7a4fa0abd97b18b7b59c54f6f /arch/arm/mach-pxa/colibri-pxa270.c | |
| parent | 64ed267bdac799485a938dd2cba8243ba383cd5f (diff) | |
| download | op-kernel-dev-851982c1b6ca18cedf6d01e4529a0c1ddb30771e.zip op-kernel-dev-851982c1b6ca18cedf6d01e4529a0c1ddb30771e.tar.gz | |
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/colibri-pxa270.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index bc04510..73205bc 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c @@ -209,7 +209,7 @@ static void __init colibri_pxa270_income_init(void) MACHINE_START(COLIBRI, "Toradex Colibri PXA270") .boot_params = COLIBRI_SDRAM_BASE + 0x100, .init_machine = colibri_pxa270_init, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, MACHINE_END @@ -217,7 +217,7 @@ MACHINE_END MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") .boot_params = 0xa0000100, .init_machine = colibri_pxa270_income_init, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, MACHINE_END |
