From: Magnus Damm <[email protected]>
Add Runtime PM support to the CMT driver.
The hardware device is enabled as long as the clocksource
or the clockevent portion of the driver is used.
Signed-off-by: Magnus Damm <[email protected]>
---
Tested on the sh7372 Mackerel board with CMT10.
drivers/clocksource/sh_cmt.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- 0008/drivers/clocksource/sh_cmt.c
+++ work/drivers/clocksource/sh_cmt.c 2011-04-25 15:01:53.000000000 +0900
@@ -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_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;
}
@@ -187,8 +190,9 @@ static void sh_cmt_disable(struct sh_cmt
/* 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 */
@@ -660,6 +664,7 @@ static int __devinit sh_cmt_probe(struct
if (p) {
dev_info(&pdev->dev, "kept as earlytimer\n");
+ pm_runtime_enable(&pdev->dev);
return 0;
}
@@ -674,6 +679,9 @@ static int __devinit sh_cmt_probe(struct
kfree(p);
platform_set_drvdata(pdev, NULL);
}
+
+ if (!is_early_platform_device(pdev))
+ pm_runtime_enable(&pdev->dev);
return ret;
}
On Mon, 2011-04-25 at 22:36 +0900, Magnus Damm wrote:
> From: Magnus Damm <[email protected]>
>
> Add Runtime PM support to the CMT driver.
>
> The hardware device is enabled as long as the clocksource
> or the clockevent portion of the driver is used.
>
> Signed-off-by: Magnus Damm <[email protected]>
Acked-by: John Stultz <[email protected]>