diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 20:50:08 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 20:50:08 (GMT) |
| commit | 62dc7c02c31c2cc66c46cc8761d421c60bb07a6f (patch) | |
| tree | 73068d760963dc8e154a4e54025e41a529c67b83 /drivers/clocksource/sh_cmt.c | |
| parent | cf3bbcaf09cb158590d1a9e0c0a6796d4fe92452 (diff) | |
| parent | 57d13370cfaf6017c68981e66ff5b3bf20a2705c (diff) | |
| download | linux-fsl-qoriq-62dc7c02c31c2cc66c46cc8761d421c60bb07a6f.tar.xz | |
Merge branch 'pm-domains'
* pm-domains:
PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()
PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()
PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()
PM / Domains: Introduce "always on" device flag
PM / Domains: Fix hibernation restore of devices, v2
PM / Domains: Fix handling of wakeup devices during system resume
Diffstat (limited to 'drivers/clocksource/sh_cmt.c')
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index ca09bc4..32fe9ef 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -32,6 +32,7 @@ #include <linux/sh_timer.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/pm_domain.h> struct sh_cmt_priv { void __iomem *mapbase; @@ -689,6 +690,9 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev) struct sh_cmt_priv *p = platform_get_drvdata(pdev); int ret; + if (!is_early_platform_device(pdev)) + pm_genpd_dev_always_on(&pdev->dev, true); + if (p) { dev_info(&pdev->dev, "kept as earlytimer\n"); return 0; |