Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / arch / arm / mach-shmobile / pm-sh7372.c

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index d467c86..933fb41 100644 (file)
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -91,6 +91,35 @@ static int pd_power_up(struct generic_pm_domain *genpd)
        return ret;
 }
 
+static int pd_power_up_a3rv(struct generic_pm_domain *genpd)
+{
+       int ret = pd_power_up(genpd);
+
+       /* force A4LC on after A3RV has been requested on */
+       pm_genpd_poweron(&sh7372_a4lc.genpd);
+
+       return ret;
+}
+
+static int pd_power_down_a3rv(struct generic_pm_domain *genpd)
+{
+       int ret = pd_power_down(genpd);
+
+       /* try to power down A4LC after A3RV is requested off */
+       genpd_queue_power_off_work(&sh7372_a4lc.genpd);
+
+       return ret;
+}
+
+static int pd_power_down_a4lc(struct generic_pm_domain *genpd)
+{
+       /* only power down A4LC if A3RV is off */
+       if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift)))
+               return pd_power_down(genpd);
+
+       return -EBUSY;
+}
+
 static bool pd_active_wakeup(struct device *dev)
 {
        return true;
@@ -104,9 +133,18 @@ void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)
        genpd->stop_device = pm_clk_suspend;
        genpd->start_device = pm_clk_resume;
        genpd->active_wakeup = pd_active_wakeup;
-       genpd->power_off = pd_power_down;
-       genpd->power_on = pd_power_up;
-       pd_power_up(&sh7372_pd->genpd);
+
+       if (sh7372_pd == &sh7372_a4lc) {
+               genpd->power_off = pd_power_down_a4lc;
+               genpd->power_on = pd_power_up;
+       } else if (sh7372_pd == &sh7372_a3rv) {
+               genpd->power_off = pd_power_down_a3rv;
+               genpd->power_on = pd_power_up_a3rv;
+       } else {
+               genpd->power_off = pd_power_down;
+               genpd->power_on = pd_power_up;
+       }
+       genpd->power_on(&sh7372_pd->genpd);
 }
 
 void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
@@ -125,10 +163,26 @@ struct sh7372_pm_domain sh7372_a4lc = {
        .bit_shift = 1,
 };
 
+struct sh7372_pm_domain sh7372_a4mp = {
+       .bit_shift = 2,
+};
+
+struct sh7372_pm_domain sh7372_d4 = {
+       .bit_shift = 3,
+};
+
 struct sh7372_pm_domain sh7372_a3rv = {
        .bit_shift = 6,
 };
 
+struct sh7372_pm_domain sh7372_a3ri = {
+       .bit_shift = 8,
+};
+
+struct sh7372_pm_domain sh7372_a3sg = {
+       .bit_shift = 13,
+};
+
 #endif /* CONFIG_PM */
 
 static void sh7372_enter_core_standby(void)