From: Magnus Damm <magnus.damm@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: johnstul@us.ibm.com, Magnus Damm <magnus.damm@gmail.com>,
lethal@linux-sh.org, linux-sh@vger.kernel.org
Subject: [PATCH] clocksource: sh_tmu: Runtime PM support
Date: Mon, 25 Apr 2011 13:40:26 +0000 [thread overview]
Message-ID: <20110425134026.4249.13858.sendpatchset@t400s> (raw)
From: Magnus Damm <damm@opensource.se>
Add Runtime PM support to the TMU 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 <damm@opensource.se>
---
Tested on the sh7372 Mackerel board with TMU00 and TMU01.
drivers/clocksource/sh_tmu.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- 0010/drivers/clocksource/sh_tmu.c
+++ work/drivers/clocksource/sh_tmu.c 2011-04-25 15:13:20.000000000 +0900
@@ -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_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
/* 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,
@@ -411,6 +415,7 @@ static int __devinit sh_tmu_probe(struct
if (p) {
dev_info(&pdev->dev, "kept as earlytimer\n");
+ pm_runtime_enable(&pdev->dev);
return 0;
}
@@ -425,6 +430,9 @@ static int __devinit sh_tmu_probe(struct
kfree(p);
platform_set_drvdata(pdev, NULL);
}
+
+ if (!is_early_platform_device(pdev))
+ pm_runtime_enable(&pdev->dev);
return ret;
}
WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: johnstul@us.ibm.com, Magnus Damm <magnus.damm@gmail.com>,
lethal@linux-sh.org, linux-sh@vger.kernel.org
Subject: [PATCH] clocksource: sh_tmu: Runtime PM support
Date: Mon, 25 Apr 2011 22:40:26 +0900 [thread overview]
Message-ID: <20110425134026.4249.13858.sendpatchset@t400s> (raw)
From: Magnus Damm <damm@opensource.se>
Add Runtime PM support to the TMU 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 <damm@opensource.se>
---
Tested on the sh7372 Mackerel board with TMU00 and TMU01.
drivers/clocksource/sh_tmu.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- 0010/drivers/clocksource/sh_tmu.c
+++ work/drivers/clocksource/sh_tmu.c 2011-04-25 15:13:20.000000000 +0900
@@ -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_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
/* 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,
@@ -411,6 +415,7 @@ static int __devinit sh_tmu_probe(struct
if (p) {
dev_info(&pdev->dev, "kept as earlytimer\n");
+ pm_runtime_enable(&pdev->dev);
return 0;
}
@@ -425,6 +430,9 @@ static int __devinit sh_tmu_probe(struct
kfree(p);
platform_set_drvdata(pdev, NULL);
}
+
+ if (!is_early_platform_device(pdev))
+ pm_runtime_enable(&pdev->dev);
return ret;
}
next reply other threads:[~2011-04-25 13:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-25 13:40 Magnus Damm [this message]
2011-04-25 13:40 ` [PATCH] clocksource: sh_tmu: Runtime PM support Magnus Damm
2011-04-28 20:55 ` john stultz
2011-04-28 20:55 ` john stultz
2011-05-23 8:30 ` Paul Mundt
2011-05-23 8:30 ` Paul Mundt
2011-05-31 4:04 ` Paul Mundt
2011-05-31 4:04 ` Paul Mundt
2011-05-31 6:22 ` Paul Mundt
2011-05-31 6:22 ` Paul Mundt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110425134026.4249.13858.sendpatchset@t400s \
--to=magnus.damm@gmail.com \
--cc=johnstul@us.ibm.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.