ARM: zynq: Move clock_init from slcr to common

Preparation step for next changes.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
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 1db2a5ca9ab8c8280dd11db69e1cc98538a76ba2..bf6717f5cd3cfa45067f43ff95e088b2f48d9967 100644 (file)
--- 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)
 static void __init zynq_timer_init(void)
 {
        zynq_slcr_init();
+
+       zynq_clock_init(zynq_slcr_base);
        clocksource_of_init();
 }
 

diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 1836d5a34606a6a252057e5d060f9f14583c2715..59ad09ff3bc064b7e3e5a8d9c3d68e698634c6a8 100644 (file)
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -106,8 +106,6 @@ int __init zynq_slcr_init(void)
 
        pr_info("%s mapped to %p\n", np->name, zynq_slcr_base);
 
-       zynq_clock_init(zynq_slcr_base);
-
        of_node_put(np);
 
        return 0;