diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 44 | ||||
-rw-r--r-- | arch/arm/mach-pxa/idp.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 7 |
4 files changed, 59 insertions, 20 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 1d7677669a76..2e9e1702c4b3 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -92,14 +92,42 @@ EXPORT_SYMBOL(pxa_set_cken); | |||
92 | * and cache flush area. | 92 | * and cache flush area. |
93 | */ | 93 | */ |
94 | static struct map_desc standard_io_desc[] __initdata = { | 94 | static struct map_desc standard_io_desc[] __initdata = { |
95 | /* virtual physical length type */ | 95 | { /* Devs */ |
96 | { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */ | 96 | .virtual = 0xf2000000, |
97 | { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */ | 97 | .pfn = __phys_to_pfn(0x40000000), |
98 | { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */ | 98 | .length = 0x02000000, |
99 | { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */ | 99 | .type = MT_DEVICE |
100 | { 0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */ | 100 | }, { /* LCD */ |
101 | { 0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */ | 101 | .virtual = 0xf4000000, |
102 | { 0xff000000, 0x00000000, 0x00100000, MT_DEVICE } /* UNCACHED_PHYS_0 */ | 102 | .pfn = __phys_to_pfn(0x44000000), |
103 | .length = 0x00100000, | ||
104 | .type = MT_DEVICE | ||
105 | }, { /* Mem Ctl */ | ||
106 | .virtual = 0xf6000000, | ||
107 | .pfn = __phys_to_pfn(0x48000000), | ||
108 | .length = 0x00100000, | ||
109 | .type = MT_DEVICE | ||
110 | }, { /* USB host */ | ||
111 | .virtual = 0xf8000000, | ||
112 | .pfn = __phys_to_pfn(0x4c000000), | ||
113 | .length = 0x00100000, | ||
114 | .type = MT_DEVICE | ||
115 | }, { /* Camera */ | ||
116 | .virtual = 0xfa000000, | ||
117 | .pfn = __phys_to_pfn(0x50000000), | ||
118 | .length = 0x00100000, | ||
119 | .type = MT_DEVICE | ||
120 | }, { /* IMem ctl */ | ||
121 | .virtual = 0xfe000000, | ||
122 | .pfn = __phys_to_pfn(0x58000000), | ||
123 | .length = 0x00100000, | ||
124 | .type = MT_DEVICE | ||
125 | }, { /* UNCACHED_PHYS_0 */ | ||
126 | .virtual = 0xff000000, | ||
127 | .pfn = __phys_to_pfn(0x00000000), | ||
128 | .length = 0x00100000, | ||
129 | .type = MT_DEVICE | ||
130 | } | ||
103 | }; | 131 | }; |
104 | 132 | ||
105 | void __init pxa_map_io(void) | 133 | void __init pxa_map_io(void) |
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index 386e107b53cc..01a83ab09ac3 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -152,16 +152,17 @@ static void __init idp_init_irq(void) | |||
152 | } | 152 | } |
153 | 153 | ||
154 | static struct map_desc idp_io_desc[] __initdata = { | 154 | static struct map_desc idp_io_desc[] __initdata = { |
155 | /* virtual physical length type */ | 155 | { |
156 | 156 | .virtual = IDP_COREVOLT_VIRT, | |
157 | { IDP_COREVOLT_VIRT, | 157 | .pfn = __phys_to_pfn(IDP_COREVOLT_PHYS), |
158 | IDP_COREVOLT_PHYS, | 158 | .length = IDP_COREVOLT_SIZE, |
159 | IDP_COREVOLT_SIZE, | 159 | .type = MT_DEVICE |
160 | MT_DEVICE }, | 160 | }, { |
161 | { IDP_CPLD_VIRT, | 161 | .virtual = IDP_CPLD_VIRT, |
162 | IDP_CPLD_PHYS, | 162 | .pfn = __phys_to_pfn(IDP_CPLD_PHYS), |
163 | IDP_CPLD_SIZE, | 163 | .length = IDP_CPLD_SIZE, |
164 | MT_DEVICE } | 164 | .type = MT_DEVICE |
165 | } | ||
165 | }; | 166 | }; |
166 | 167 | ||
167 | static void __init idp_map_io(void) | 168 | static void __init idp_map_io(void) |
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 1f38033921e9..69abc7f61ed0 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -246,7 +246,12 @@ static void __init lubbock_init(void) | |||
246 | } | 246 | } |
247 | 247 | ||
248 | static struct map_desc lubbock_io_desc[] __initdata = { | 248 | static struct map_desc lubbock_io_desc[] __initdata = { |
249 | { LUBBOCK_FPGA_VIRT, LUBBOCK_FPGA_PHYS, 0x00100000, MT_DEVICE }, /* CPLD */ | 249 | { /* CPLD */ |
250 | .virtual = LUBBOCK_FPGA_VIRT, | ||
251 | .pfn = __phys_to_pfn(LUBBOCK_FPGA_PHYS), | ||
252 | .length = 0x00100000, | ||
253 | .type = MT_DEVICE | ||
254 | } | ||
250 | }; | 255 | }; |
251 | 256 | ||
252 | static void __init lubbock_map_io(void) | 257 | static void __init lubbock_map_io(void) |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 85fdb5b1470a..8b4a21623fc0 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -317,7 +317,12 @@ static void __init mainstone_init(void) | |||
317 | 317 | ||
318 | 318 | ||
319 | static struct map_desc mainstone_io_desc[] __initdata = { | 319 | static struct map_desc mainstone_io_desc[] __initdata = { |
320 | { MST_FPGA_VIRT, MST_FPGA_PHYS, 0x00100000, MT_DEVICE }, /* CPLD */ | 320 | { /* CPLD */ |
321 | .virtual = MST_FPGA_VIRT, | ||
322 | .pfn = __phys_to_pfn(MST_FPGA_PHYS), | ||
323 | .length = 0x00100000, | ||
324 | .type = MT_DEVICE | ||
325 | } | ||
321 | }; | 326 | }; |
322 | 327 | ||
323 | static void __init mainstone_map_io(void) | 328 | static void __init mainstone_map_io(void) |