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/pxa3xx.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/pxa3xx.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index d1c747cdacf8..5480a94e6469 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/sysdev.h> | 23 | #include <linux/sysdev.h> |
24 | 24 | ||
25 | #include <asm/mach/map.h> | ||
25 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
26 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
27 | #include <mach/pxa3xx-regs.h> | 28 | #include <mach/pxa3xx-regs.h> |
@@ -580,6 +581,22 @@ void __init pxa3xx_init_irq(void) | |||
580 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL); | 581 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL); |
581 | } | 582 | } |
582 | 583 | ||
584 | static struct map_desc pxa3xx_io_desc[] __initdata = { | ||
585 | { /* Mem Ctl */ | ||
586 | .virtual = 0xf6000000, | ||
587 | .pfn = __phys_to_pfn(0x4a000000), | ||
588 | .length = 0x00200000, | ||
589 | .type = MT_DEVICE | ||
590 | } | ||
591 | }; | ||
592 | |||
593 | void __init pxa3xx_map_io(void) | ||
594 | { | ||
595 | pxa_map_io(); | ||
596 | iotable_init(ARRAY_AND_SIZE(pxa3xx_io_desc)); | ||
597 | pxa3xx_get_clk_frequency_khz(1); | ||
598 | } | ||
599 | |||
583 | /* | 600 | /* |
584 | * device registration specific to PXA3xx. | 601 | * device registration specific to PXA3xx. |
585 | */ | 602 | */ |