From f5ebdfc90286e2e91135b813eacc422cd0afed5b Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat, 7 Mar 2009 12:55:49 +0100
Subject: [PATCH] --- yaml --- r: 137543 b: refs/heads/master c:
 05fd8e73e1357feaea9c48938d937eae76b4aef4 h: refs/heads/master i:   137541:
 a0e39d30948f7c7404b606574eed28e4b54fef74   137539:
 d89ad982e77e72d5e835aab36798f94df3fb2e4c   137535:
 491e6bdbc28298bc5021d805f40427f5b301c2ba v: v3

---
 [refs]                         |  2 +-
 trunk/arch/arm/common/clkdev.c | 11 +++++++++--
 trunk/include/linux/clk.h      | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 82357174a776..acd9f007dfba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0412d6c9271811b84568fcea3237e2193e21866a
+refs/heads/master: 05fd8e73e1357feaea9c48938d937eae76b4aef4
diff --git a/trunk/arch/arm/common/clkdev.c b/trunk/arch/arm/common/clkdev.c
index 1037bba18329..5589444ff437 100644
--- a/trunk/arch/arm/common/clkdev.c
+++ b/trunk/arch/arm/common/clkdev.c
@@ -62,9 +62,8 @@ static struct clk *clk_find(const char *dev_id, const char *con_id)
 	return clk;
 }
 
-struct clk *clk_get(struct device *dev, const char *con_id)
+struct clk *clk_get_sys(const char *dev_id, const char *con_id)
 {
-	const char *dev_id = dev ? dev_name(dev) : NULL;
 	struct clk *clk;
 
 	mutex_lock(&clocks_mutex);
@@ -75,6 +74,14 @@ struct clk *clk_get(struct device *dev, const char *con_id)
 
 	return clk ? clk : ERR_PTR(-ENOENT);
 }
+EXPORT_SYMBOL(clk_get_sys);
+
+struct clk *clk_get(struct device *dev, const char *con_id)
+{
+	const char *dev_id = dev ? dev_name(dev) : NULL;
+
+	return clk_get_sys(dev_id, con_id);
+}
 EXPORT_SYMBOL(clk_get);
 
 void clk_put(struct clk *clk)
diff --git a/trunk/include/linux/clk.h b/trunk/include/linux/clk.h
index 778777316ea4..1db9bbf444a3 100644
--- a/trunk/include/linux/clk.h
+++ b/trunk/include/linux/clk.h
@@ -125,4 +125,21 @@ int clk_set_parent(struct clk *clk, struct clk *parent);
  */
 struct clk *clk_get_parent(struct clk *clk);
 
+/**
+ * clk_get_sys - get a clock based upon the device name
+ * @dev_id: device name
+ * @con_id: connection ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno.  The implementation
+ * uses @dev_id and @con_id to determine the clock consumer, and
+ * thereby the clock producer. In contrast to clk_get() this function
+ * takes the device name instead of the device itself for identification.
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * clk_get_sys should not be called from within interrupt context.
+ */
+struct clk *clk_get_sys(const char *dev_id, const char *con_id);
+
 #endif