]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
authorVishwanath BS <vishwanath.bs@ti.com>
Wed, 2 May 2012 08:44:40 +0000 (02:44 -0600)
committerPaul Walmsley <paul@pwsan.com>
Fri, 22 Jun 2012 14:40:36 +0000 (08:40 -0600)
As IO Daisy chain sequence is triggered via hwmod mux, there is no need to
control it from cpuidle path for OMAP3.

Also as omap3_disable_io_chain is no longer being used, just remove the
function.

Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/pm34xx.c

index 9d6cb7cc94ab3f7d436e9038bfd640d3d3e2c203..9d8258f1666612f8502512587a6b967d734cf21c 100644 (file)
@@ -272,13 +272,6 @@ void omap_sram_idle(void)
        /* Enable IO-PAD and IO-CHAIN wakeups */
        per_next_state = pwrdm_read_next_pwrst(per_pwrdm);
        core_next_state = pwrdm_read_next_pwrst(core_pwrdm);
-       if (omap3_has_io_wakeup() &&
-           (per_next_state < PWRDM_POWER_ON ||
-            core_next_state < PWRDM_POWER_ON)) {
-               omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
-               if (omap3_has_io_chain_ctrl())
-                       omap3xxx_prm_reconfigure_io_chain();
-       }
 
        pwrdm_pre_transition();
 
@@ -351,13 +344,6 @@ void omap_sram_idle(void)
        if (per_next_state < PWRDM_POWER_ON)
                omap2_gpio_resume_after_idle();
 
-       /* Disable IO-PAD and IO-CHAIN wakeup */
-       if (omap3_has_io_wakeup() &&
-           (per_next_state < PWRDM_POWER_ON ||
-            core_next_state < PWRDM_POWER_ON))
-               omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
-                                            PM_WKEN);
-
        clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
 }