From: Josh Cartwright <joshc@ni.com>
Date: Wed, 3 Feb 2016 02:30:48 +0000 (-0600)
Subject: ARM: zynq: initialize slcr mapping earlier
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9388187fd7a8d4b4357a587c81958d70bd7e590a;p=linux-beck.git

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 6f39d03cc27e..860ffb663f02 100644
--- 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();
 }