ARM: zynq: Split slcr in two parts

Split the slcr into an early part for unlocking and cpu starting
and a later syscon driver.
Also add "syscon" compatible property for slcr.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index bf6717f5cd3c..38401cf78383 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -59,11 +59,13 @@ static void __init zynq_init_machine(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         platform_device_register(&zynq_cpuidle_device);
+
+        zynq_slcr_init();
 }
 
 static void __init zynq_timer_init(void)
 {
-        zynq_slcr_init();
+        zynq_early_slcr_init();
 
         zynq_clock_init(zynq_slcr_base);
         clocksource_of_init();