Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[deliverable/linux.git] / arch / arm / mach-zynq / common.c

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index a39be8e8085607c49156af97a4ba46462e0dac26..6fcc584c1a110fb1986ee9ddbb0ae99bfbf907a4 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>
@@ -75,11 +76,16 @@ static void __init zynq_init_machine(void)
 
        platform_device_register(&zynq_cpuidle_device);
        platform_device_register_full(&devinfo);
+
+       zynq_slcr_init();
 }
 
 static void __init zynq_timer_init(void)
 {
-       zynq_slcr_init();
+       zynq_early_slcr_init();
+
+       zynq_clock_init();
+       of_clk_init(NULL);
        clocksource_of_init();
 }