From 6dc7a2145b1f4216b949e4d7788706d3bb34f7f9 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Dec 2011 23:27:28 +0100
Subject: [PATCH] --- yaml --- r: 280419 b: refs/heads/master c:
 925b44a273aa8c4c23c006c1228aacd538eead09 h: refs/heads/master i:   280417:
 9e4191f1505cfc293b639678c6f67e7dd02c816c   280415:
 2fdf9d615fd2cbe7aa511a7a07457b31c746e8a2 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/base/power/domain_governor.c | 13 +++++++++++++
 trunk/include/linux/pm_domain.h            |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d7a6e697c503..2dae6ccecf85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9914854b4ca339e511d052ce3a1a441ef15b928
+refs/heads/master: 925b44a273aa8c4c23c006c1228aacd538eead09
diff --git a/trunk/drivers/base/power/domain_governor.c b/trunk/drivers/base/power/domain_governor.c
index da78540e9b40..51527ee92d10 100644
--- a/trunk/drivers/base/power/domain_governor.c
+++ b/trunk/drivers/base/power/domain_governor.c
@@ -141,3 +141,16 @@ struct dev_power_governor simple_qos_governor = {
 	.stop_ok = default_stop_ok,
 	.power_down_ok = default_power_down_ok,
 };
+
+static bool always_on_power_down_ok(struct dev_pm_domain *domain)
+{
+	return false;
+}
+
+/**
+ * pm_genpd_gov_always_on - A governor implementing an always-on policy
+ */
+struct dev_power_governor pm_domain_always_on_gov = {
+	.power_down_ok = always_on_power_down_ok,
+	.stop_ok = default_stop_ok,
+};
diff --git a/trunk/include/linux/pm_domain.h b/trunk/include/linux/pm_domain.h
index fb809b904891..a03a0ad998b8 100644
--- a/trunk/include/linux/pm_domain.h
+++ b/trunk/include/linux/pm_domain.h
@@ -140,6 +140,7 @@ extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
 
 extern bool default_stop_ok(struct device *dev);
 
+extern struct dev_power_governor pm_domain_always_on_gov;
 #else
 
 static inline struct generic_pm_domain *dev_to_genpd(struct device *dev)
@@ -193,6 +194,7 @@ static inline bool default_stop_ok(struct device *dev)
 {
 	return false;
 }
+#define pm_domain_always_on_gov NULL
 #endif
 
 static inline int pm_genpd_remove_callbacks(struct device *dev)