ARM: zynq: initialize slcr mapping earlier

In preparation for performing additional configuration prior to bringing
up L2, move the slcr initialization earlier in the boot process.

Signed-off-by: Josh Cartwright <joshc@ni.com>
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 6f39d03cc27eac777a243abcb5a08ea4c35e8d7c..860ffb663f02b1c08c15c55f1c3fbf7638e610a8 100644 (file)
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -150,8 +150,6 @@ out:
 
 static void __init zynq_timer_init(void)
 {
-       zynq_early_slcr_init();
-
        zynq_clock_init();
        of_clk_init(NULL);
        clocksource_probe();
@@ -186,6 +184,7 @@ static void __init zynq_map_io(void)
 
 static void __init zynq_irq_init(void)
 {
+       zynq_early_slcr_init();
        irqchip_init();
 }