1 files changed, 37 insertions, 4 deletions

diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index d9b76ca64a61..c5eea858054a 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/pm_domain.h>
+#include <linux/pm_runtime.h>
 
 struct sh_mtu2_priv {
         void __iomem *mapbase;
@@ -123,6 +124,9 @@ static int sh_mtu2_enable(struct sh_mtu2_priv *p)
 {
         int ret;
 
+        pm_runtime_get_sync(&p->pdev->dev);
+        dev_pm_syscore_device(&p->pdev->dev, true);
+
         /* enable clock */
         ret = clk_enable(p->clk);
         if (ret) {
@@ -157,6 +161,9 @@ static void sh_mtu2_disable(struct sh_mtu2_priv *p)
 
         /* stop clock */
         clk_disable(p->clk);
+
+        dev_pm_syscore_device(&p->pdev->dev, false);
+        pm_runtime_put(&p->pdev->dev);
 }
 
 static irqreturn_t sh_mtu2_interrupt(int irq, void *dev_id)
@@ -208,6 +215,16 @@ static void sh_mtu2_clock_event_mode(enum clock_event_mode mode,
         }
 }
 
+static void sh_mtu2_clock_event_suspend(struct clock_event_device *ced)
+{
+        pm_genpd_syscore_poweroff(&ced_to_sh_mtu2(ced)->pdev->dev);
+}
+
+static void sh_mtu2_clock_event_resume(struct clock_event_device *ced)
+{
+        pm_genpd_syscore_poweron(&ced_to_sh_mtu2(ced)->pdev->dev);
+}
+
 static void sh_mtu2_register_clockevent(struct sh_mtu2_priv *p,
                                        char *name, unsigned long rating)
 {
@@ -221,6 +238,8 @@ static void sh_mtu2_register_clockevent(struct sh_mtu2_priv *p,
         ced->rating = rating;
         ced->cpumask = cpumask_of(0);
         ced->set_mode = sh_mtu2_clock_event_mode;
+        ced->suspend = sh_mtu2_clock_event_suspend;
+        ced->resume = sh_mtu2_clock_event_resume;
 
         dev_info(&p->pdev->dev, "used for clock events\n");
         clockevents_register_device(ced);
@@ -305,14 +324,17 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
 static int __devinit sh_mtu2_probe(struct platform_device *pdev)
 {
         struct sh_mtu2_priv *p = platform_get_drvdata(pdev);
+        struct sh_timer_config *cfg = pdev->dev.platform_data;
         int ret;
 
-        if (!is_early_platform_device(pdev))
-                pm_genpd_dev_always_on(&pdev->dev, true);
+        if (!is_early_platform_device(pdev)) {
+                pm_runtime_set_active(&pdev->dev);
+                pm_runtime_enable(&pdev->dev);
+        }
 
         if (p) {
                 dev_info(&pdev->dev, "kept as earlytimer\n");
-                return 0;
+                goto out;
         }
 
         p = kmalloc(sizeof(*p), GFP_KERNEL);
@@ -325,8 +347,19 @@ static int __devinit sh_mtu2_probe(struct platform_device *pdev)
         if (ret) {
                 kfree(p);
                 platform_set_drvdata(pdev, NULL);
+                pm_runtime_idle(&pdev->dev);
+                return ret;
         }
-        return ret;
+        if (is_early_platform_device(pdev))
+                return 0;
+
+ out:
+        if (cfg->clockevent_rating)
+                pm_runtime_irq_safe(&pdev->dev);
+        else
+                pm_runtime_idle(&pdev->dev);
+
+        return 0;
 }
 
 static int __devexit sh_mtu2_remove(struct platform_device *pdev)