aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-zynq/common.c2
-rw-r--r--drivers/clk/zynq/clkc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 93ea19b13e6e..5755129a6e47 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>
@@ -68,6 +69,7 @@ static void __init zynq_timer_init(void)
68 zynq_early_slcr_init(); 69 zynq_early_slcr_init();
69 70
70 zynq_clock_init(); 71 zynq_clock_init();
72 of_clk_init(NULL);
71 clocksource_of_init(); 73 clocksource_of_init();
72} 74}
73 75
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 03052d67b197..c812b93a52b2 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -602,8 +602,6 @@ void __init zynq_clock_init(void)
602 of_node_put(slcr); 602 of_node_put(slcr);
603 of_node_put(np); 603 of_node_put(np);
604 604
605 of_clk_init(NULL);
606
607 return; 605 return;
608 606
609np_err: 607np_err: