---

yaml --- r: 350741 b: refs/heads/master c: 8ae5ac5 h: refs/heads/master i: 350739: 1d01107 v: v3
git-mirror · Jan 24, 2013 · 3478631 · 3478631
1 parent f721943
commit 3478631
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10290030d7d31e387f602190ece2cdb3abfb3d71
+refs/heads/master: 8ae5ac5607b5baf7c1178998032ba752f61c7165
diff --git a/trunk/drivers/clk/versatile/clk-vexpress-osc.c b/trunk/drivers/clk/versatile/clk-vexpress-osc.c
@@ -144,3 +144,4 @@ void __init vexpress_osc_of_setup(struct device_node *node)
 		vexpress_config_func_put(osc->func);
 	kfree(osc);
 }
+CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup);
diff --git a/trunk/drivers/clk/versatile/clk-vexpress.c b/trunk/drivers/clk/versatile/clk-vexpress.c
@@ -99,19 +99,13 @@ struct clk *vexpress_sp810_of_get(struct of_phandle_args *clkspec, void *data)
 	return vexpress_sp810_timerclken[clkspec->args[0]];
 }
 
-static const __initconst struct of_device_id vexpress_fixed_clk_match[] = {
-	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-	{ .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
-	{}
-};
-
 void __init vexpress_clk_of_init(void)
 {
 	struct device_node *node;
 	struct clk *clk;
 	struct clk *refclk, *timclk;
 
-	of_clk_init(vexpress_fixed_clk_match);
+	of_clk_init(NULL);
 
 	node = of_find_compatible_node(NULL, NULL, "arm,sp810");
 	vexpress_sp810_init(of_iomap(node, 0));