1 files changed, 9 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index b12d715dee5b..210de9d292fb 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -44,6 +44,7 @@
 
 #include <plat/clockdomain.h>
 #include "clockdomains.h"
+
 #include <plat/omap_hwmod.h>
 
 /*
@@ -315,6 +316,8 @@ static int __init _omap2_init_reprogram_sdrc(void)
 void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,
                                  struct omap_sdrc_params *sdrc_cs1)
 {
+        u8 skip_setup_idle = 0;
+
         pwrdm_init(powerdomains_omap);
         clkdm_init(clockdomains_omap, clkdm_autodeps);
         if (cpu_is_omap242x())
@@ -338,9 +341,13 @@ 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_PM_RUNTIME
+        skip_setup_idle = 1;
+#endif
         if (cpu_is_omap24xx() || cpu_is_omap34xx())   /* FIXME: OMAP4 */
-                omap_hwmod_late_init();
-        omap_pm_if_init();
+                omap_hwmod_late_init(skip_setup_idle);
+
         if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
                 omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
                 _omap2_init_reprogram_sdrc();