From 9a4240184dc181f13f9694aac4ad89417ffcfe60 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 7 Apr 2012 21:39:39 -0500
Subject: [PATCH] --- yaml --- r: 316619 b: refs/heads/master c:
 015ba40246497ae02a5f644d4c8adfec76d9b75c h: refs/heads/master i:   316617:
 8bc6f2c64d5a21c883ece7021f4611bf75f2b14f   316615:
 2d4b55f3c56bc52ff6e6dce09b64a5874c5b1d92 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/clk/clk-fixed-rate.c | 23 +++++++++++++++++++++++
 trunk/include/linux/clk-provider.h |  2 ++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 039e26ff89fd..5dc66937eca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 766e6a4ec602d0c107553b91b3434fe9c03474f4
+refs/heads/master: 015ba40246497ae02a5f644d4c8adfec76d9b75c
diff --git a/trunk/drivers/clk/clk-fixed-rate.c b/trunk/drivers/clk/clk-fixed-rate.c
index 7e1464569727..f5ec0eebd4d7 100644
--- a/trunk/drivers/clk/clk-fixed-rate.c
+++ b/trunk/drivers/clk/clk-fixed-rate.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/of.h>
 
 /*
  * DOC: basic fixed-rate clock that cannot gate
@@ -79,3 +80,25 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
 
 	return clk;
 }
+
+#ifdef CONFIG_OF
+/**
+ * of_fixed_clk_setup() - Setup function for simple fixed rate clock
+ */
+void __init of_fixed_clk_setup(struct device_node *node)
+{
+	struct clk *clk;
+	const char *clk_name = node->name;
+	u32 rate;
+
+	if (of_property_read_u32(node, "clock-frequency", &rate))
+		return;
+
+	of_property_read_string(node, "clock-output-names", &clk_name);
+
+	clk = clk_register_fixed_rate(NULL, clk_name, NULL, CLK_IS_ROOT, rate);
+	if (clk)
+		of_clk_add_provider(node, of_clk_src_simple_get, clk);
+}
+EXPORT_SYMBOL_GPL(of_fixed_clk_setup);
+#endif
diff --git a/trunk/include/linux/clk-provider.h b/trunk/include/linux/clk-provider.h
index 7c9c691102b5..77335fac943e 100644
--- a/trunk/include/linux/clk-provider.h
+++ b/trunk/include/linux/clk-provider.h
@@ -172,6 +172,8 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
 		const char *parent_name, unsigned long flags,
 		unsigned long fixed_rate);
 
+void of_fixed_clk_setup(struct device_node *np);
+
 /**
  * struct clk_gate - gating clock
  *