Skip to content

Commit

Permalink
sh: MTU2: Basic runtime PM support
Browse files Browse the repository at this point in the history
Modify the SH MTU2 clock event device driver to support runtime PM at
a basic level (i.e. device clocks can be disabled and enabled, but
domain power must be on, because the device has to be marked as
"irq safe").

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
  • Loading branch information
Rafael J. Wysocki committed Sep 3, 2012
1 parent bad8138 commit 3cb6f10
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions drivers/clocksource/sh_mtu2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -317,18 +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)) {
struct sh_timer_config *cfg = pdev->dev.platform_data;

if (cfg->clockevent_rating)
dev_pm_syscore_device(&pdev->dev, true);
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);
Expand All @@ -341,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)
Expand Down

0 comments on commit 3cb6f10

Please sign in to comment.