aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/cm-x2xx.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-10-10 20:20:19 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-12-16 01:31:15 -0500
commit851982c1b6ca18cedf6d01e4529a0c1ddb30771e (patch)
tree08438d74fabb2ce7a4fa0abd97b18b7b59c54f6f /arch/arm/mach-pxa/cm-x2xx.c
parent64ed267bdac799485a938dd2cba8243ba383cd5f (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/cm-x2xx.c')
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index d34b99febeb9..47e242005fac 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -498,7 +498,12 @@ static struct map_desc cmx2xx_io_desc[] __initdata = {
498 498
499static void __init cmx2xx_map_io(void) 499static void __init cmx2xx_map_io(void)
500{ 500{
501 pxa_map_io(); 501 if (cpu_is_pxa25x())
502 pxa25x_map_io();
503
504 if (cpu_is_pxa27x())
505 pxa27x_map_io();
506
502 iotable_init(cmx2xx_io_desc, ARRAY_SIZE(cmx2xx_io_desc)); 507 iotable_init(cmx2xx_io_desc, ARRAY_SIZE(cmx2xx_io_desc));
503 508
504 it8152_base_address = CMX2XX_IT8152_VIRT; 509 it8152_base_address = CMX2XX_IT8152_VIRT;
@@ -506,7 +511,11 @@ static void __init cmx2xx_map_io(void)
506#else 511#else
507static void __init cmx2xx_map_io(void) 512static void __init cmx2xx_map_io(void)
508{ 513{
509 pxa_map_io(); 514 if (cpu_is_pxa25x())
515 pxa25x_map_io();
516
517 if (cpu_is_pxa27x())
518 pxa27x_map_io();
510} 519}
511#endif 520#endif
512 521