From fcda23aa101d3ced39787879abf345018a4db09c Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 13 Mar 2012 22:40:06 +0100
Subject: [PATCH] --- yaml --- r: 291887 b: refs/heads/master c:
 615a445f7f8a077c145e737864ae59a4d8717882 h: refs/heads/master i:   291885:
 f11ae3f00a5a629f7aec6942e4c9adba90ca3666   291883:
 6649ba5fd893d17dbcaf49046eb96e4cdc54d08f   291879:
 70dad622b0db83c562067109d0e289931e475b0f   291871:
 3beb60fbe1ade27e7b414e3e6003bf300cf20c36 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/clocksource/sh_cmt.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23f36773ff42..b8893dd6419c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa
+refs/heads/master: 615a445f7f8a077c145e737864ae59a4d8717882
diff --git a/trunk/drivers/clocksource/sh_cmt.c b/trunk/drivers/clocksource/sh_cmt.c
index ca09bc421ddb..32fe9ef5cc5c 100644
--- a/trunk/drivers/clocksource/sh_cmt.c
+++ b/trunk/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;