clk: vexpress: Use common of_clk_init() function

Use common of_clk_init() function for clock initialization.

Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

2 files changed, 2 insertions, 7 deletions

diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index dcb6ae0a0425..256c8be74df8 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -144,3 +144,4 @@ error:
                 vexpress_config_func_put(osc->func);
         kfree(osc);
 }
+CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup);
diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c
index c742ac7c60bb..f889f2f07b37 100644
--- a/drivers/clk/versatile/clk-vexpress.c
+++ b/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));