OMAP4: fix temporary hacks that break multi-omap PM
Subsystems (3)
PATCH v2 1/1 OMAP4: fix temporary hacks that break multi-omap PM
When building for multi-omap, and OMAP4 is enabled, CONFIG_ARCH_OMAP4 will be true and prevent included code from building/running for OMAP2/3 as well.
This problem exists in io.c where some hwmod/PM/SDRC init code is prevented from running even on OMAP2/3 when OMAP4 is included in a multi-OMAP build.
A quick glance suggests that this #ifndef is no longer needed. The called functions should work fine or fail gracefully in the OMAP4 case.
Signed-off-by Kevin Hilman <[email protected]>
---
Needs testing on OMAP4 since still no OMAP4 hardware here.
Updates from v1:
- removed additional #ifdef block in init_common_hw()
arch/arm/mach-omap2/io.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/io.c +1 -4
@@ -309,7 +309,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, {pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_autodeps); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ #ifdef CONFIG_ARCH_OMAP2420 if (cpu_is_omap242x ())omap2420_hwmod_init ();
@@ -325,7 +324,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,omap2_mux_init ();/* The OPP tables have to be registered before a clk init */ omap_pm_if_early_init (mpu_opps, dsp_opps, l3_opps); -#endif if (cpu_is_omap2420 ())omap2420_clk_init ();
@@ -339,11 +337,10 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,pr_err ("Could not init clock framework - unknown CPU\n" );omap_serial_early_init (); -#ifndef CONFIG_ARCH_OMAP4 omap_hwmod_late_init ();omap_pm_if_init ();omap2_sdrc_init (sdrc_cs0, sdrc_cs1);_omap2_init_reprogram_sdrc (); -#endif +gpmc_init (); }
Signature · 1 line
1.7.0.2