diff options
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 101 |
1 files changed, 67 insertions, 34 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4b9491aa36fa..8d014ba04abc 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -173,7 +173,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = { | |||
173 | }; | 173 | }; |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | #ifdef CONFIG_SOC_OMAPTI81XX | 176 | #ifdef CONFIG_SOC_TI81XX |
177 | static struct map_desc omapti81xx_io_desc[] __initdata = { | 177 | static struct map_desc omapti81xx_io_desc[] __initdata = { |
178 | { | 178 | { |
179 | .virtual = L4_34XX_VIRT, | 179 | .virtual = L4_34XX_VIRT, |
@@ -184,7 +184,7 @@ static struct map_desc omapti81xx_io_desc[] __initdata = { | |||
184 | }; | 184 | }; |
185 | #endif | 185 | #endif |
186 | 186 | ||
187 | #ifdef CONFIG_SOC_OMAPAM33XX | 187 | #ifdef CONFIG_SOC_AM33XX |
188 | static struct map_desc omapam33xx_io_desc[] __initdata = { | 188 | static struct map_desc omapam33xx_io_desc[] __initdata = { |
189 | { | 189 | { |
190 | .virtual = L4_34XX_VIRT, | 190 | .virtual = L4_34XX_VIRT, |
@@ -216,41 +216,11 @@ static struct map_desc omap44xx_io_desc[] __initdata = { | |||
216 | .type = MT_DEVICE, | 216 | .type = MT_DEVICE, |
217 | }, | 217 | }, |
218 | { | 218 | { |
219 | .virtual = OMAP44XX_GPMC_VIRT, | ||
220 | .pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS), | ||
221 | .length = OMAP44XX_GPMC_SIZE, | ||
222 | .type = MT_DEVICE, | ||
223 | }, | ||
224 | { | ||
225 | .virtual = OMAP44XX_EMIF1_VIRT, | ||
226 | .pfn = __phys_to_pfn(OMAP44XX_EMIF1_PHYS), | ||
227 | .length = OMAP44XX_EMIF1_SIZE, | ||
228 | .type = MT_DEVICE, | ||
229 | }, | ||
230 | { | ||
231 | .virtual = OMAP44XX_EMIF2_VIRT, | ||
232 | .pfn = __phys_to_pfn(OMAP44XX_EMIF2_PHYS), | ||
233 | .length = OMAP44XX_EMIF2_SIZE, | ||
234 | .type = MT_DEVICE, | ||
235 | }, | ||
236 | { | ||
237 | .virtual = OMAP44XX_DMM_VIRT, | ||
238 | .pfn = __phys_to_pfn(OMAP44XX_DMM_PHYS), | ||
239 | .length = OMAP44XX_DMM_SIZE, | ||
240 | .type = MT_DEVICE, | ||
241 | }, | ||
242 | { | ||
243 | .virtual = L4_PER_44XX_VIRT, | 219 | .virtual = L4_PER_44XX_VIRT, |
244 | .pfn = __phys_to_pfn(L4_PER_44XX_PHYS), | 220 | .pfn = __phys_to_pfn(L4_PER_44XX_PHYS), |
245 | .length = L4_PER_44XX_SIZE, | 221 | .length = L4_PER_44XX_SIZE, |
246 | .type = MT_DEVICE, | 222 | .type = MT_DEVICE, |
247 | }, | 223 | }, |
248 | { | ||
249 | .virtual = L4_EMU_44XX_VIRT, | ||
250 | .pfn = __phys_to_pfn(L4_EMU_44XX_PHYS), | ||
251 | .length = L4_EMU_44XX_SIZE, | ||
252 | .type = MT_DEVICE, | ||
253 | }, | ||
254 | #ifdef CONFIG_OMAP4_ERRATA_I688 | 224 | #ifdef CONFIG_OMAP4_ERRATA_I688 |
255 | { | 225 | { |
256 | .virtual = OMAP4_SRAM_VA, | 226 | .virtual = OMAP4_SRAM_VA, |
@@ -286,14 +256,14 @@ void __init omap34xx_map_common_io(void) | |||
286 | } | 256 | } |
287 | #endif | 257 | #endif |
288 | 258 | ||
289 | #ifdef CONFIG_SOC_OMAPTI81XX | 259 | #ifdef CONFIG_SOC_TI81XX |
290 | void __init omapti81xx_map_common_io(void) | 260 | void __init omapti81xx_map_common_io(void) |
291 | { | 261 | { |
292 | iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc)); | 262 | iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc)); |
293 | } | 263 | } |
294 | #endif | 264 | #endif |
295 | 265 | ||
296 | #ifdef CONFIG_SOC_OMAPAM33XX | 266 | #ifdef CONFIG_SOC_AM33XX |
297 | void __init omapam33xx_map_common_io(void) | 267 | void __init omapam33xx_map_common_io(void) |
298 | { | 268 | { |
299 | iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc)); | 269 | iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc)); |
@@ -380,6 +350,13 @@ void __init omap2420_init_early(void) | |||
380 | omap_hwmod_init_postsetup(); | 350 | omap_hwmod_init_postsetup(); |
381 | omap2420_clk_init(); | 351 | omap2420_clk_init(); |
382 | } | 352 | } |
353 | |||
354 | void __init omap2420_init_late(void) | ||
355 | { | ||
356 | omap_mux_late_init(); | ||
357 | omap2_common_pm_late_init(); | ||
358 | omap2_pm_init(); | ||
359 | } | ||
383 | #endif | 360 | #endif |
384 | 361 | ||
385 | #ifdef CONFIG_SOC_OMAP2430 | 362 | #ifdef CONFIG_SOC_OMAP2430 |
@@ -395,6 +372,13 @@ void __init omap2430_init_early(void) | |||
395 | omap_hwmod_init_postsetup(); | 372 | omap_hwmod_init_postsetup(); |
396 | omap2430_clk_init(); | 373 | omap2430_clk_init(); |
397 | } | 374 | } |
375 | |||
376 | void __init omap2430_init_late(void) | ||
377 | { | ||
378 | omap_mux_late_init(); | ||
379 | omap2_common_pm_late_init(); | ||
380 | omap2_pm_init(); | ||
381 | } | ||
398 | #endif | 382 | #endif |
399 | 383 | ||
400 | /* | 384 | /* |
@@ -449,6 +433,48 @@ void __init ti81xx_init_early(void) | |||
449 | omap_hwmod_init_postsetup(); | 433 | omap_hwmod_init_postsetup(); |
450 | omap3xxx_clk_init(); | 434 | omap3xxx_clk_init(); |
451 | } | 435 | } |
436 | |||
437 | void __init omap3_init_late(void) | ||
438 | { | ||
439 | omap_mux_late_init(); | ||
440 | omap2_common_pm_late_init(); | ||
441 | omap3_pm_init(); | ||
442 | } | ||
443 | |||
444 | void __init omap3430_init_late(void) | ||
445 | { | ||
446 | omap_mux_late_init(); | ||
447 | omap2_common_pm_late_init(); | ||
448 | omap3_pm_init(); | ||
449 | } | ||
450 | |||
451 | void __init omap35xx_init_late(void) | ||
452 | { | ||
453 | omap_mux_late_init(); | ||
454 | omap2_common_pm_late_init(); | ||
455 | omap3_pm_init(); | ||
456 | } | ||
457 | |||
458 | void __init omap3630_init_late(void) | ||
459 | { | ||
460 | omap_mux_late_init(); | ||
461 | omap2_common_pm_late_init(); | ||
462 | omap3_pm_init(); | ||
463 | } | ||
464 | |||
465 | void __init am35xx_init_late(void) | ||
466 | { | ||
467 | omap_mux_late_init(); | ||
468 | omap2_common_pm_late_init(); | ||
469 | omap3_pm_init(); | ||
470 | } | ||
471 | |||
472 | void __init ti81xx_init_late(void) | ||
473 | { | ||
474 | omap_mux_late_init(); | ||
475 | omap2_common_pm_late_init(); | ||
476 | omap3_pm_init(); | ||
477 | } | ||
452 | #endif | 478 | #endif |
453 | 479 | ||
454 | #ifdef CONFIG_ARCH_OMAP4 | 480 | #ifdef CONFIG_ARCH_OMAP4 |
@@ -465,6 +491,13 @@ void __init omap4430_init_early(void) | |||
465 | omap_hwmod_init_postsetup(); | 491 | omap_hwmod_init_postsetup(); |
466 | omap4xxx_clk_init(); | 492 | omap4xxx_clk_init(); |
467 | } | 493 | } |
494 | |||
495 | void __init omap4430_init_late(void) | ||
496 | { | ||
497 | omap_mux_late_init(); | ||
498 | omap2_common_pm_late_init(); | ||
499 | omap4_pm_init(); | ||
500 | } | ||
468 | #endif | 501 | #endif |
469 | 502 | ||
470 | void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, | 503 | void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, |