summaryrefslogtreecommitdiff
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorJosh Cartwright <joshc@ni.com>2016-02-03 05:30:48 +0300
committerMichal Simek <michal.simek@xilinx.com>2016-02-09 12:18:11 +0300
commit9388187fd7a8d4b4357a587c81958d70bd7e590a (patch)
tree3fcbebd80133cecce9ea3cdadc46c76b2a77d41e /arch/arm/mach-zynq
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
downloadlinux-9388187fd7a8d4b4357a587c81958d70bd7e590a.tar.xz
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>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r--arch/arm/mach-zynq/common.c3
1 files changed, 1 insertions, 2 deletions
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();
}