ARM: zynq: Move of_clk_init from clock driver

Move of_clk_init() from clock driver to enable
options not to use zynq clock driver.
Use for example fixed clock setting.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 93ea19b13e6ee355badba81b08d68abfc08be3db..5755129a6e479f08edf226db120af263298d5e95 100644 (file)
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -19,6 +19,7 @@
 #include <linux/cpumask.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/clk/zynq.h>
 #include <linux/clocksource.h>
 #include <linux/of_address.h>
@@ -68,6 +69,7 @@ static void __init zynq_timer_init(void)
        zynq_early_slcr_init();
 
        zynq_clock_init();
+       of_clk_init(NULL);
        clocksource_of_init();
 }
 

diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 03052d67b197c82ae754b5775d29899afe82dde8..c812b93a52b28774232e420a389c34b21aef5544 100644 (file)
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -602,8 +602,6 @@ void __init zynq_clock_init(void)
        of_node_put(slcr);
        of_node_put(np);
 
-       of_clk_init(NULL);
-
        return;
 
 np_err: