Merge branch 'for-next/clk'

arch/arm/lib/barebox.lds.S

@@ -92,6 +92,8 @@ SECTIONS
 	__usymtab : { BAREBOX_SYMS }
 	__usymtab_end = .;
 
+	.oftables : { BAREBOX_CLK_TABLE() }
+
 	.dtb : { BAREBOX_DTB() }
 
 	.rel.dyn : {

drivers/clk/clk-fixed.c

@@ -54,3 +54,26 @@ struct clk *clk_fixed(const char *name, int rate)
 
 	return &fix->clk;
 }
+
+#if defined(CONFIG_OFTREE) && defined(CONFIG_COMMON_CLK_OF_PROVIDER)
+/**
+ * of_fixed_clk_setup() - Setup function for simple fixed rate clock
+ */
+static int 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 -EINVAL;
+
+	of_property_read_string(node, "clock-output-names", &clk_name);
+
+	clk = clk_fixed(clk_name, rate);
+	if (IS_ERR(clk))
+		return IS_ERR(clk);
+	return of_clk_add_provider(node, of_clk_src_simple_get, clk);
+}
+CLK_OF_DECLARE(fixed_clk, "fixed-clock", of_fixed_clk_setup);
+#endif

drivers/clk/clk.c

@@ -271,6 +271,10 @@ struct of_clk_provider {
 	void *data;
 };
 
+extern struct of_device_id __clk_of_table_start[];
+const struct of_device_id __clk_of_table_sentinel
+	__attribute__ ((unused,section (".__clk_of_table_end")));
+
 static LIST_HEAD(of_clk_providers);
 
 struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec,
@@ -355,6 +359,39 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
 
 	return clk;
 }
+
+/**
+ * of_clk_init() - Scan and init clock providers from the DT
+ * @root: parent of the first level to probe or NULL for the root of the tree
+ * @matches: array of compatible values and init functions for providers.
+ *
+ * This function scans the device tree for matching clock providers and
+ * calls their initialization functions
+ *
+ * Returns 0 on success, < 0 on failure.
+ */
+int of_clk_init(struct device_node *root, const struct of_device_id *matches)
+{
+	const struct of_device_id *match;
+	int rc;
+
+	if (!root)
+		root = of_find_node_by_path("/");
+	if (!root)
+		return -EINVAL;
+	if (!matches)
+		matches = __clk_of_table_start;
+
+	for_each_matching_node_and_match(root, matches, &match) {
+		of_clk_init_cb_t clk_init_cb = (of_clk_init_cb_t)match->data;
+		rc = clk_init_cb(root);
+		if (rc)
+			pr_err("%s: failed to init clock for %s: %d\n",
+			       __func__, root->full_name, rc);
+	}
+
+	return 0;
+}
 #endif
 
 static void dump_one(struct clk *clk, int verbose, int indent)

drivers/of/base.c

@@ -1734,6 +1734,7 @@ int of_probe(void)
 		of_add_memory(memory, false);
 
 	of_platform_populate(root_node, of_default_bus_match_table, NULL);
+	of_clk_init(root_node, NULL);
 
 	return 0;
 }

include/asm-generic/barebox.lds.h

@@ -41,9 +41,16 @@
 
 #define BAREBOX_MAGICVARS	KEEP(*(SORT_BY_NAME(.barebox_magicvar*)))
 
+#define BAREBOX_CLK_TABLE()			\
+	. = ALIGN(8);				\
+	__clk_of_table_start = .;		\
+	KEEP(*(.__clk_of_table_*));		\
+	__clk_of_table_end = .;
+
 #define BAREBOX_DTB()				\
+	. = ALIGN(8);				\
 	__dtb_start = .;			\
-	KEEP(*(.dtb.rodata.*));				\
+	KEEP(*(.dtb.rodata.*));			\
 	__dtb_end = .;
 
 #if defined(CONFIG_ARCH_BAREBOX_MAX_BARE_INIT_SIZE) && \

include/linux/clk.h

@@ -12,6 +12,7 @@
 #define __LINUX_CLK_H
 
 #include <linux/err.h>
+#include <linux/stringify.h>
 
 struct device_d;
 
@@ -278,6 +279,11 @@ void clk_dump(int verbose);
 struct device_node;
 struct of_phandle_args;
 
+#define CLK_OF_DECLARE(name, compat, fn)				\
+const struct of_device_id __clk_of_table_##name				\
+__attribute__ ((unused,section (".__clk_of_table_" __stringify(name)))) \
+	= { .compatible = compat, .data = (u32)fn }
+
 #if defined(CONFIG_OFTREE) && defined(CONFIG_COMMON_CLK_OF_PROVIDER)
 int of_clk_add_provider(struct device_node *np,
 			struct clk *(*clk_src_get)(struct of_phandle_args *args,
@@ -285,6 +291,8 @@ int of_clk_add_provider(struct device_node *np,
 			void *data);
 void of_clk_del_provider(struct device_node *np);
 
+typedef int (*of_clk_init_cb_t)(struct device_node *);
+
 struct clk_onecell_data {
 	struct clk **clks;
 	unsigned int clk_num;
@@ -295,6 +303,7 @@ struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec, void *data);
 struct clk *of_clk_get(struct device_node *np, int index);
 struct clk *of_clk_get_by_name(struct device_node *np, const char *name);
 struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec);
+int of_clk_init(struct device_node *root, const struct of_device_id *matches);
 #else
 static inline struct clk *of_clk_get(struct device_node *np, int index)
 {
@@ -305,6 +314,11 @@ static inline struct clk *of_clk_get_by_name(struct device_node *np,
 {
 	return ERR_PTR(-ENOENT);
 }
+static inline int of_clk_init(struct device_node *root,
+			      const struct of_device_id *matches)
+{
+	return 0;
+}
 #endif
 
 #endif