7 files changed, 226 insertions, 7 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 803bc6edfca4..b473b8efac68 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -1408,9 +1408,14 @@ static void __init ap4evb_init(void)
 
         platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));
 
+        sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device);
+        sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
+        sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
+
         hdmi_init_pm_clock();
         fsi_init_pm_clock();
         sh7372_pm_init();
+        pm_clk_add(&fsi_device.dev, "spu2");
 }
 
 static void __init ap4evb_timer_init(void)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 3802f2afabef..5b36b6c5b448 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1582,8 +1582,13 @@ static void __init mackerel_init(void)
 
         platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
 
+        sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
+        sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
+        sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
+
         hdmi_init_pm_clock();
         sh7372_pm_init();
+        pm_clk_add(&fsi_device.dev, "spu2");
 }
 
 static void __init mackerel_timer_init(void)
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index c0800d83971e..91f5779abdd3 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]),
         CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]),
         CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]),
+        CLKDEV_ICK_ID("spu2", "sh_fsi2", &mstp_clks[MSTP223]),
 };
 
 void __init sh7372_clock_init(void)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index df20d7670172..ce595cee86cd 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -12,6 +12,7 @@
 #define __ASM_SH7372_H__
 
 #include <linux/sh_clk.h>
+#include <linux/pm_domain.h>
 
 /*
  * Pin Function Controller:
@@ -470,4 +471,32 @@ extern struct clk sh7372_fsibck_clk;
 extern struct clk sh7372_fsidiva_clk;
 extern struct clk sh7372_fsidivb_clk;
 
+struct platform_device;
+
+struct sh7372_pm_domain {
+        struct generic_pm_domain genpd;
+        unsigned int bit_shift;
+};
+
+static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d)
+{
+        return container_of(d, struct sh7372_pm_domain, genpd);
+}
+
+#ifdef CONFIG_PM
+extern struct sh7372_pm_domain sh7372_a4lc;
+extern struct sh7372_pm_domain sh7372_a4mp;
+extern struct sh7372_pm_domain sh7372_d4;
+extern struct sh7372_pm_domain sh7372_a3rv;
+extern struct sh7372_pm_domain sh7372_a3ri;
+extern struct sh7372_pm_domain sh7372_a3sg;
+
+extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd);
+extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
+                                        struct platform_device *pdev);
+#else
+#define sh7372_init_pm_domain(pd) do { } while(0)
+#define sh7372_add_device_to_domain(pd, pdev) do { } while(0)
+#endif /* CONFIG_PM */
+
 #endif /* __ASM_SH7372_H__ */
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 8e4aadf14c9f..933fb411be0f 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -15,16 +15,176 @@
 #include <linux/list.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 #include <mach/common.h>
+#include <mach/sh7372.h>
 
 #define SMFRAM 0xe6a70000
 #define SYSTBCR 0xe6150024
 #define SBAR 0xe6180020
 #define APARMBAREA 0xe6f10020
 
+#define SPDCR 0xe6180008
+#define SWUCR 0xe6180014
+#define PSTR 0xe6180080
+
+#define PSTR_RETRIES 100
+#define PSTR_DELAY_US 10
+
+#ifdef CONFIG_PM
+
+static int pd_power_down(struct generic_pm_domain *genpd)
+{
+        struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);
+        unsigned int mask = 1 << sh7372_pd->bit_shift;
+
+        if (__raw_readl(PSTR) & mask) {
+                unsigned int retry_count;
+
+                __raw_writel(mask, SPDCR);
+
+                for (retry_count = PSTR_RETRIES; retry_count; retry_count--) {
+                        if (!(__raw_readl(SPDCR) & mask))
+                                break;
+                        cpu_relax();
+                }
+        }
+
+        pr_debug("sh7372 power domain down 0x%08x -> PSTR = 0x%08x\n",
+                 mask, __raw_readl(PSTR));
+
+        return 0;
+}
+
+static int pd_power_up(struct generic_pm_domain *genpd)
+{
+        struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);
+        unsigned int mask = 1 << sh7372_pd->bit_shift;
+        unsigned int retry_count;
+        int ret = 0;
+
+        if (__raw_readl(PSTR) & mask)
+                goto out;
+
+        __raw_writel(mask, SWUCR);
+
+        for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {
+                if (!(__raw_readl(SWUCR) & mask))
+                        goto out;
+                if (retry_count > PSTR_RETRIES)
+                        udelay(PSTR_DELAY_US);
+                else
+                        cpu_relax();
+        }
+        if (__raw_readl(SWUCR) & mask)
+                ret = -EIO;
+
+ out:
+        pr_debug("sh7372 power domain up 0x%08x -> PSTR = 0x%08x\n",
+                 mask, __raw_readl(PSTR));
+
+        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;
+}
+
+void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)
+{
+        struct generic_pm_domain *genpd = &sh7372_pd->genpd;
+
+        pm_genpd_init(genpd, NULL, false);
+        genpd->stop_device = pm_clk_suspend;
+        genpd->start_device = pm_clk_resume;
+        genpd->active_wakeup = pd_active_wakeup;
+
+        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,
+                                 struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+
+        if (!dev->power.subsys_data) {
+                pm_clk_init(dev);
+                pm_clk_add(dev, NULL);
+        }
+        pm_genpd_add_device(&sh7372_pd->genpd, dev);
+}
+
+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)
 {
         void __iomem *smfram = (void __iomem *)SMFRAM;
diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c
index 2d1b67a59e4a..6ec454e1e063 100644
--- a/arch/arm/mach-shmobile/pm_runtime.c
+++ b/arch/arm/mach-shmobile/pm_runtime.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/sh_clk.h>
@@ -28,31 +29,38 @@ static int default_platform_runtime_idle(struct device *dev)
         return pm_runtime_suspend(dev);
 }
 
-static struct dev_power_domain default_power_domain = {
+static struct dev_pm_domain default_pm_domain = {
         .ops = {
-                .runtime_suspend = pm_runtime_clk_suspend,
-                .runtime_resume = pm_runtime_clk_resume,
+                .runtime_suspend = pm_clk_suspend,
+                .runtime_resume = pm_clk_resume,
                 .runtime_idle = default_platform_runtime_idle,
                 USE_PLATFORM_PM_SLEEP_OPS
         },
 };
 
-#define DEFAULT_PWR_DOMAIN_PTR  (&default_power_domain)
+#define DEFAULT_PM_DOMAIN_PTR   (&default_pm_domain)
 
 #else
 
-#define DEFAULT_PWR_DOMAIN_PTR  NULL
+#define DEFAULT_PM_DOMAIN_PTR   NULL
 
 #endif /* CONFIG_PM_RUNTIME */
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
-        .pwr_domain = DEFAULT_PWR_DOMAIN_PTR,
+        .pm_domain = DEFAULT_PM_DOMAIN_PTR,
         .con_ids = { NULL, },
 };
 
 static int __init sh_pm_runtime_init(void)
 {
-        pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
+        pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
         return 0;
 }
 core_initcall(sh_pm_runtime_init);
+
+static int __init sh_pm_runtime_late_init(void)
+{
+        pm_genpd_poweroff_unused();
+        return 0;
+}
+late_initcall(sh_pm_runtime_late_init);
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index cd807eea69e2..79f0413d8725 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -841,11 +841,22 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
 
 void __init sh7372_add_standard_devices(void)
 {
+        sh7372_init_pm_domain(&sh7372_a4lc);
+        sh7372_init_pm_domain(&sh7372_a4mp);
+        sh7372_init_pm_domain(&sh7372_d4);
+        sh7372_init_pm_domain(&sh7372_a3rv);
+        sh7372_init_pm_domain(&sh7372_a3ri);
+        sh7372_init_pm_domain(&sh7372_a3sg);
+
         platform_add_devices(sh7372_early_devices,
                             ARRAY_SIZE(sh7372_early_devices));
 
         platform_add_devices(sh7372_late_devices,
                             ARRAY_SIZE(sh7372_late_devices));
+
+        sh7372_add_device_to_domain(&sh7372_a3rv, &vpu_device);
+        sh7372_add_device_to_domain(&sh7372_a4mp, &spu0_device);
+        sh7372_add_device_to_domain(&sh7372_a4mp, &spu1_device);
 }
 
 void __init sh7372_add_early_devices(void)