OMAP2/3 clkdm/pwrdm: move wkdep/sleepdep handling from pwrdm to clkdm

Move clockdomain wakeup dependency and sleep dependency data
structures from the powerdomain layer to the clockdomain layer, where
they belong.  These dependencies were originally placed in the
powerdomain layer due to unclear documentation; however, it is clear
now that these dependencies are between clockdomains.  For OMAP2/3,
this is not such a big problem, but for OMAP4 this needs to be fixed.

Thanks to Benoît Cousson <b-cousson@ti.com> for his advice on this
patch.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index f841a6e33611..5f59df87abf7 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -1018,6 +1018,7 @@ void omap_push_sram_idle(void)
 static int __init omap3_pm_init(void)
 {
         struct power_state *pwrst, *tmp;
+        struct clockdomain *neon_clkdm, *per_clkdm, *mpu_clkdm, *core_clkdm;
         int ret;
 
         if (!cpu_is_omap34xx())
@@ -1057,6 +1058,11 @@ static int __init omap3_pm_init(void)
         core_pwrdm = pwrdm_lookup("core_pwrdm");
         cam_pwrdm = pwrdm_lookup("cam_pwrdm");
 
+        neon_clkdm = clkdm_lookup("neon_clkdm");
+        mpu_clkdm = clkdm_lookup("mpu_clkdm");
+        per_clkdm = clkdm_lookup("per_clkdm");
+        core_clkdm = clkdm_lookup("core_clkdm");
+
         omap_push_sram_idle();
 #ifdef CONFIG_SUSPEND
         suspend_set_ops(&omap_pm_ops);
@@ -1065,14 +1071,14 @@ static int __init omap3_pm_init(void)
         pm_idle = omap3_pm_idle;
         omap3_idle_init();
 
-        pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm);
+        clkdm_add_wkdep(neon_clkdm, mpu_clkdm);
         /*
          * REVISIT: This wkdep is only necessary when GPIO2-6 are enabled for
          * IO-pad wakeup.  Otherwise it will unnecessarily waste power
          * waking up PER with every CORE wakeup - see
          * http://marc.info/?l=linux-omap&m=121852150710062&w=2
         */
-        pwrdm_add_wkdep(per_pwrdm, core_pwrdm);
+        clkdm_add_wkdep(per_clkdm, core_clkdm);
 
         if (omap_type() != OMAP2_DEVICE_TYPE_GP) {
                 omap3_secure_ram_storage =