aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
-rw-r--r--arch/arm/mach-zynq/common.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index a39be8e80856..6fcc584c1a11 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -19,6 +19,7 @@
19#include <linux/cpumask.h> 19#include <linux/cpumask.h>
20#include <linux/platform_device.h> 20#include <linux/platform_device.h>
21#include <linux/clk.h> 21#include <linux/clk.h>
22#include <linux/clk-provider.h>
22#include <linux/clk/zynq.h> 23#include <linux/clk/zynq.h>
23#include <linux/clocksource.h> 24#include <linux/clocksource.h>
24#include <linux/of_address.h> 25#include <linux/of_address.h>
@@ -75,11 +76,16 @@ static void __init zynq_init_machine(void)
75 76
76 platform_device_register(&zynq_cpuidle_device); 77 platform_device_register(&zynq_cpuidle_device);
77 platform_device_register_full(&devinfo); 78 platform_device_register_full(&devinfo);
79
80 zynq_slcr_init();
78} 81}
79 82
80static void __init zynq_timer_init(void) 83static void __init zynq_timer_init(void)
81{ 84{
82 zynq_slcr_init(); 85 zynq_early_slcr_init();
86
87 zynq_clock_init();
88 of_clk_init(NULL);
83 clocksource_of_init(); 89 clocksource_of_init();
84} 90}
85 91