diff options
-rw-r--r-- | arch/arm/mach-zynq/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-zynq/slcr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 1db2a5ca9ab8..bf6717f5cd3c 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
@@ -64,6 +64,8 @@ static void __init zynq_init_machine(void) | |||
64 | static void __init zynq_timer_init(void) | 64 | static void __init zynq_timer_init(void) |
65 | { | 65 | { |
66 | zynq_slcr_init(); | 66 | zynq_slcr_init(); |
67 | |||
68 | zynq_clock_init(zynq_slcr_base); | ||
67 | clocksource_of_init(); | 69 | clocksource_of_init(); |
68 | } | 70 | } |
69 | 71 | ||
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 1836d5a34606..59ad09ff3bc0 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c | |||
@@ -106,8 +106,6 @@ int __init zynq_slcr_init(void) | |||
106 | 106 | ||
107 | pr_info("%s mapped to %p\n", np->name, zynq_slcr_base); | 107 | pr_info("%s mapped to %p\n", np->name, zynq_slcr_base); |
108 | 108 | ||
109 | zynq_clock_init(zynq_slcr_base); | ||
110 | |||
111 | of_node_put(np); | 109 | of_node_put(np); |
112 | 110 | ||
113 | return 0; | 111 | return 0; |