aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/generic.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/generic.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/generic.c')
-rw-r--r--arch/arm/mach-pxa/generic.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 69a89fe4ce8d..6a5f37935378 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -86,27 +86,15 @@ EXPORT_SYMBOL(get_memclk_frequency_10khz);
86/* 86/*
87 * Intel PXA2xx internal register mapping. 87 * Intel PXA2xx internal register mapping.
88 * 88 *
89 * Note 1: not all PXA2xx variants implement all those addresses. 89 * Note: virtual 0xfffe0000-0xffffffff is reserved for the vector table
90 * 90 * and cache flush area.
91 * Note 2: virtual 0xfffe0000-0xffffffff is reserved for the vector table
92 * and cache flush area.
93 */ 91 */
94static struct map_desc standard_io_desc[] __initdata = { 92static struct map_desc common_io_desc[] __initdata = {
95 { /* Devs */ 93 { /* Devs */
96 .virtual = 0xf2000000, 94 .virtual = 0xf2000000,
97 .pfn = __phys_to_pfn(0x40000000), 95 .pfn = __phys_to_pfn(0x40000000),
98 .length = 0x02000000, 96 .length = 0x02000000,
99 .type = MT_DEVICE 97 .type = MT_DEVICE
100 }, { /* Mem Ctl */
101 .virtual = 0xf6000000,
102 .pfn = __phys_to_pfn(0x48000000),
103 .length = 0x00200000,
104 .type = MT_DEVICE
105 }, { /* IMem ctl */
106 .virtual = 0xfe000000,
107 .pfn = __phys_to_pfn(0x58000000),
108 .length = 0x00100000,
109 .type = MT_DEVICE
110 }, { /* UNCACHED_PHYS_0 */ 98 }, { /* UNCACHED_PHYS_0 */
111 .virtual = 0xff000000, 99 .virtual = 0xff000000,
112 .pfn = __phys_to_pfn(0x00000000), 100 .pfn = __phys_to_pfn(0x00000000),
@@ -117,6 +105,5 @@ static struct map_desc standard_io_desc[] __initdata = {
117 105
118void __init pxa_map_io(void) 106void __init pxa_map_io(void)
119{ 107{
120 iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); 108 iotable_init(ARRAY_AND_SIZE(common_io_desc));
121 get_clk_frequency_khz(1);
122} 109}