Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
  sh: Ignore R_SH_NONE module relocations.
  SH: SE7751: Fix pcibios_map_platform_irq prototype.
  sh: remove warning and warning_symbol from struct stacktrace_ops
  sh: wire up sys_sendmmsg.
  clocksource: sh_tmu: Runtime PM support
  clocksource: sh_tmu: __clocksource_updatefreq_hz() update
  clocksource: sh_cmt: Runtime PM support
  clocksource: sh_cmt: __clocksource_updatefreq_hz() update
  dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
  dmaengine: shdma: add runtime- and system-level power management
  dmaengine: shdma: fix locking
  sh: sh-sci: sh7377 and sh73a0 build fixes
  sh: cosmetic improvement: use an existing pointer
  serial: sh-sci: suspend/resume wakeup support V2
  serial: sh-sci: Runtime PM support
  sh: select IRQ_FORCED_THREADING.
  sh: intc: Set virtual IRQs as nothread.
  sh: fixup fpu.o compile order
  i2c: add a module alias to the sh-mobile driver
  ALSA: add a module alias to the FSI driver
  ...

2 files changed, 35 insertions, 27 deletions

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index f975d24890fa..036e5865eb40 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -24,6 +24,7 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/pm_runtime.h>
 #include <linux/irq.h>
 #include <linux/err.h>
 #include <linux/clocksource.h>
@@ -152,10 +153,12 @@ static int sh_cmt_enable(struct sh_cmt_priv *p, unsigned long *rate)
 {
         int ret;
 
-        /* enable clock */
+        /* wake up device and enable clock */
+        pm_runtime_get_sync(&p->pdev->dev);
         ret = clk_enable(p->clk);
         if (ret) {
                 dev_err(&p->pdev->dev, "cannot enable clock\n");
+                pm_runtime_put_sync(&p->pdev->dev);
                 return ret;
         }
 
@@ -187,8 +190,9 @@ static void sh_cmt_disable(struct sh_cmt_priv *p)
         /* disable interrupts in CMT block */
         sh_cmt_write(p, CMCSR, 0);
 
-        /* stop clock */
+        /* stop clock and mark device as idle */
         clk_disable(p->clk);
+        pm_runtime_put_sync(&p->pdev->dev);
 }
 
 /* private flags */
@@ -416,11 +420,15 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)
 
 static int sh_cmt_clocksource_enable(struct clocksource *cs)
 {
+        int ret;
         struct sh_cmt_priv *p = cs_to_sh_cmt(cs);
 
         p->total_cycles = 0;
 
-        return sh_cmt_start(p, FLAG_CLOCKSOURCE);
+        ret = sh_cmt_start(p, FLAG_CLOCKSOURCE);
+        if (!ret)
+                __clocksource_updatefreq_hz(cs, p->rate);
+        return ret;
 }
 
 static void sh_cmt_clocksource_disable(struct clocksource *cs)
@@ -448,19 +456,10 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p,
         cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);
         cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
 
-        /* clk_get_rate() needs an enabled clock */
-        clk_enable(p->clk);
-        p->rate = clk_get_rate(p->clk) / ((p->width == 16) ? 512 : 8);
-        clk_disable(p->clk);
-
-        /* TODO: calculate good shift from rate and counter bit width */
-        cs->shift = 0;
-        cs->mult = clocksource_hz2mult(p->rate, cs->shift);
-
         dev_info(&p->pdev->dev, "used as clock source\n");
 
-        clocksource_register(cs);
-
+        /* Register with dummy 1 Hz value, gets updated in ->enable() */
+        clocksource_register_hz(cs, 1);
         return 0;
 }
 
@@ -665,6 +664,7 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev)
 
         if (p) {
                 dev_info(&pdev->dev, "kept as earlytimer\n");
+                pm_runtime_enable(&pdev->dev);
                 return 0;
         }
 
@@ -679,6 +679,9 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev)
                 kfree(p);
                 platform_set_drvdata(pdev, NULL);
         }
+
+        if (!is_early_platform_device(pdev))
+                pm_runtime_enable(&pdev->dev);
         return ret;
 }
 
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 36aba9923060..17296288a205 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/pm_runtime.h>
 #include <linux/irq.h>
 #include <linux/err.h>
 #include <linux/clocksource.h>
@@ -109,10 +110,12 @@ static int sh_tmu_enable(struct sh_tmu_priv *p)
 {
         int ret;
 
-        /* enable clock */
+        /* wake up device and enable clock */
+        pm_runtime_get_sync(&p->pdev->dev);
         ret = clk_enable(p->clk);
         if (ret) {
                 dev_err(&p->pdev->dev, "cannot enable clock\n");
+                pm_runtime_put_sync(&p->pdev->dev);
                 return ret;
         }
 
@@ -141,8 +144,9 @@ static void sh_tmu_disable(struct sh_tmu_priv *p)
         /* disable interrupts in TMU block */
         sh_tmu_write(p, TCR, 0x0000);
 
-        /* stop clock */
+        /* stop clock and mark device as idle */
         clk_disable(p->clk);
+        pm_runtime_put_sync(&p->pdev->dev);
 }
 
 static void sh_tmu_set_next(struct sh_tmu_priv *p, unsigned long delta,
@@ -199,8 +203,12 @@ static cycle_t sh_tmu_clocksource_read(struct clocksource *cs)
 static int sh_tmu_clocksource_enable(struct clocksource *cs)
 {
         struct sh_tmu_priv *p = cs_to_sh_tmu(cs);
+        int ret;
 
-        return sh_tmu_enable(p);
+        ret = sh_tmu_enable(p);
+        if (!ret)
+                __clocksource_updatefreq_hz(cs, p->rate);
+        return ret;
 }
 
 static void sh_tmu_clocksource_disable(struct clocksource *cs)
@@ -221,17 +229,10 @@ static int sh_tmu_register_clocksource(struct sh_tmu_priv *p,
         cs->mask = CLOCKSOURCE_MASK(32);
         cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
 
-        /* clk_get_rate() needs an enabled clock */
-        clk_enable(p->clk);
-        /* channel will be configured at parent clock / 4 */
-        p->rate = clk_get_rate(p->clk) / 4;
-        clk_disable(p->clk);
-        /* TODO: calculate good shift from rate and counter bit width */
-        cs->shift = 10;
-        cs->mult = clocksource_hz2mult(p->rate, cs->shift);
-
         dev_info(&p->pdev->dev, "used as clock source\n");
-        clocksource_register(cs);
+
+        /* Register with dummy 1 Hz value, gets updated in ->enable() */
+        clocksource_register_hz(cs, 1);
         return 0;
 }
 
@@ -414,6 +415,7 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)
 
         if (p) {
                 dev_info(&pdev->dev, "kept as earlytimer\n");
+                pm_runtime_enable(&pdev->dev);
                 return 0;
         }
 
@@ -428,6 +430,9 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)
                 kfree(p);
                 platform_set_drvdata(pdev, NULL);
         }
+
+        if (!is_early_platform_device(pdev))
+                pm_runtime_enable(&pdev->dev);
         return ret;
 }