aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.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/pxa25x.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/pxa25x.c')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index de53f2e4aa39..67200ce25e1c 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -23,6 +23,7 @@
23#include <linux/suspend.h> 23#include <linux/suspend.h>
24#include <linux/sysdev.h> 24#include <linux/sysdev.h>
25 25
26#include <asm/mach/map.h>
26#include <mach/hardware.h> 27#include <mach/hardware.h>
27#include <mach/irqs.h> 28#include <mach/irqs.h>
28#include <mach/gpio.h> 29#include <mach/gpio.h>
@@ -320,6 +321,22 @@ void __init pxa26x_init_irq(void)
320} 321}
321#endif 322#endif
322 323
324static struct map_desc pxa25x_io_desc[] __initdata = {
325 { /* Mem Ctl */
326 .virtual = 0xf6000000,
327 .pfn = __phys_to_pfn(0x48000000),
328 .length = 0x00200000,
329 .type = MT_DEVICE
330 },
331};
332
333void __init pxa25x_map_io(void)
334{
335 pxa_map_io();
336 iotable_init(ARRAY_AND_SIZE(pxa25x_io_desc));
337 pxa25x_get_clk_frequency_khz(1);
338}
339
323static struct platform_device *pxa25x_devices[] __initdata = { 340static struct platform_device *pxa25x_devices[] __initdata = {
324 &pxa25x_device_udc, 341 &pxa25x_device_udc,
325 &pxa_device_pmu, 342 &pxa_device_pmu,