OMAP: PM: Hook into PM counters

This patch modifies the clock, clockdomain and OMAP3 specific
powerdomain code to call the PM counter infrastructure whenever one or
more powerdomains might have changed state.

Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 456e2ad5f62136bb33187980f92b1323e1868462..f2a92d614f0fc5ec95c91d5b9b2de4a9378cdda4 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1043,5 +1043,7 @@ void omap2_clk_disable_unused(struct clk *clk)
                omap2_clk_disable(clk);
        } else
                _omap2_clk_disable(clk);
+       if (clk->clkdm != NULL)
+               pwrdm_clkdm_state_switch(clk->clkdm);
 }
 #endif

diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index 26912a95dc1823025f26ac5eafa4185f4b039f3c..5b0b90b76e13a6ebd138936ba856c5cc0f3c7d05 100644 (file)
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -574,6 +574,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
                omap2_clkdm_wakeup(clkdm);
 
        pwrdm_wait_transition(clkdm->pwrdm.ptr);
+       pwrdm_clkdm_state_switch(clkdm);
 
        return 0;
 }
@@ -626,6 +627,8 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
        else
                omap2_clkdm_sleep(clkdm);
 
+       pwrdm_clkdm_state_switch(clkdm);
+
        return 0;
 }
 

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 488d595d8e4b337a29a589a950a5d3f73aca15a4..f1976242f9974cb21715931523fa3d557d029896 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -170,6 +170,8 @@ static void omap_sram_idle(void)
                printk(KERN_ERR "Invalid mpu state in sram_idle\n");
                return;
        }
+       pwrdm_pre_transition();
+
        omap2_gpio_prepare_for_retention();
        omap_uart_prepare_idle(0);
        omap_uart_prepare_idle(1);
@@ -182,6 +184,9 @@ static void omap_sram_idle(void)
        omap_uart_resume_idle(1);
        omap_uart_resume_idle(0);
        omap2_gpio_resume_after_retention();
+
+       pwrdm_post_transition();
+
 }
 
 /*
@@ -271,6 +276,7 @@ static int set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
        if (sleep_switch) {
                omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
                pwrdm_wait_transition(pwrdm);
+               pwrdm_state_switch(pwrdm);
        }
 
 err: