From cf9164e0fb0505c766da8db7069dfc7670cbb6e2 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 15 Aug 2012 20:32:59 +0200
Subject: [PATCH] --- yaml --- r: 328679 b: refs/heads/master c:
 74a2799ab51acec9410f467fef8678ebb1125d7d h: refs/heads/master i:   328677:
 1300d1ab7e0c7491462439ec6e13847d5f0abb21   328675:
 b6ed4ceff97b88d6984c8248509ee793a8d4cff7   328671:
 7f48c5558fa1f8b1c249f5e1a0b354c163bcbc59 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/base/power/domain.c | 19 +++++++++++++++++++
 trunk/include/linux/pm_domain.h   | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4cea267ccef9..47a94475f84f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40114447a7f89860b46a64e5504f313656cb5f27
+refs/heads/master: 74a2799ab51acec9410f467fef8678ebb1125d7d
diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c
index e44e1a8e8376..12ad070c244f 100644
--- a/trunk/drivers/base/power/domain.c
+++ b/trunk/drivers/base/power/domain.c
@@ -1887,6 +1887,16 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
 	goto out;
 }
 
+/**
+ * pm_genpd_name_attach_cpuidle - Find PM domain and connect cpuidle to it.
+ * @name: Name of the domain to connect to cpuidle.
+ * @state: cpuidle state this domain can manipulate.
+ */
+int pm_genpd_name_attach_cpuidle(const char *name, int state)
+{
+	return pm_genpd_attach_cpuidle(pm_genpd_lookup_name(name), state);
+}
+
 /**
  * pm_genpd_detach_cpuidle - Remove the cpuidle connection from a PM domain.
  * @genpd: PM domain to remove the cpuidle connection from.
@@ -1925,6 +1935,15 @@ int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
 	return ret;
 }
 
+/**
+ * pm_genpd_name_detach_cpuidle - Find PM domain and disconnect cpuidle from it.
+ * @name: Name of the domain to disconnect cpuidle from.
+ */
+int pm_genpd_name_detach_cpuidle(const char *name)
+{
+	return pm_genpd_detach_cpuidle(pm_genpd_lookup_name(name));
+}
+
 /* Default device callbacks for generic PM domains. */
 
 /**
diff --git a/trunk/include/linux/pm_domain.h b/trunk/include/linux/pm_domain.h
index f2a633a913e7..7c1d252b20c0 100644
--- a/trunk/include/linux/pm_domain.h
+++ b/trunk/include/linux/pm_domain.h
@@ -156,7 +156,9 @@ extern int pm_genpd_add_callbacks(struct device *dev,
 				  struct gpd_timing_data *td);
 extern int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td);
 extern int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state);
+extern int pm_genpd_name_attach_cpuidle(const char *name, int state);
 extern int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd);
+extern int pm_genpd_name_detach_cpuidle(const char *name);
 extern void pm_genpd_init(struct generic_pm_domain *genpd,
 			  struct dev_power_governor *gov, bool is_off);
 
@@ -229,10 +231,18 @@ static inline int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int s
 {
 	return -ENOSYS;
 }
+static inline int pm_genpd_name_attach_cpuidle(const char *name, int state)
+{
+	return -ENOSYS;
+}
 static inline int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
 {
 	return -ENOSYS;
 }
+static inline int pm_genpd_name_detach_cpuidle(const char *name)
+{
+	return -ENOSYS;
+}
 static inline void pm_genpd_init(struct generic_pm_domain *genpd,
 				 struct dev_power_governor *gov, bool is_off)
 {