diff options
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index b9ea70bce563..40562ddd3ee4 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "clock2xxx.h" | 36 | #include "clock2xxx.h" |
37 | #include "clock3xxx.h" | 37 | #include "clock3xxx.h" |
38 | #include "clock44xx.h" | 38 | #include "clock44xx.h" |
39 | #include "io.h" | ||
39 | 40 | ||
40 | #include <plat/omap-pm.h> | 41 | #include <plat/omap-pm.h> |
41 | #include <plat/powerdomain.h> | 42 | #include <plat/powerdomain.h> |
@@ -323,6 +324,9 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, | |||
323 | omap2430_hwmod_init(); | 324 | omap2430_hwmod_init(); |
324 | else if (cpu_is_omap34xx()) | 325 | else if (cpu_is_omap34xx()) |
325 | omap3xxx_hwmod_init(); | 326 | omap3xxx_hwmod_init(); |
327 | else if (cpu_is_omap44xx()) | ||
328 | omap44xx_hwmod_init(); | ||
329 | |||
326 | /* The OPP tables have to be registered before a clk init */ | 330 | /* The OPP tables have to be registered before a clk init */ |
327 | omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps); | 331 | omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps); |
328 | 332 | ||
@@ -342,9 +346,7 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, | |||
342 | #ifndef CONFIG_PM_RUNTIME | 346 | #ifndef CONFIG_PM_RUNTIME |
343 | skip_setup_idle = 1; | 347 | skip_setup_idle = 1; |
344 | #endif | 348 | #endif |
345 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) /* FIXME: OMAP4 */ | 349 | omap_hwmod_late_init(skip_setup_idle); |
346 | omap_hwmod_late_init(skip_setup_idle); | ||
347 | |||
348 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) { | 350 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) { |
349 | omap2_sdrc_init(sdrc_cs0, sdrc_cs1); | 351 | omap2_sdrc_init(sdrc_cs0, sdrc_cs1); |
350 | _omap2_init_reprogram_sdrc(); | 352 | _omap2_init_reprogram_sdrc(); |