[PATCH 2/2] ARM: zynq: drop use of slcr_unlock in zynq_slcr_system_restart
From: Josh Cartwright <hidden>
Date: 2015-03-19 13:34:19
Also in:
lkml
Subsystem:
arm port, arm/zynq architecture, the rest · Maintainers:
Russell King, Michal Simek, Linus Torvalds
The SLCR is unconditionally unlocked early on boot in zynq_slcr_init() and not unlocked. As such, it is not necessary to explicitly unlock in the restart codepath. Signed-off-by: Josh Cartwright <redacted> --- arch/arm/mach-zynq/slcr.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index fa4c796..698dc3b 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c@@ -102,13 +102,6 @@ int zynq_slcr_system_restart(struct notifier_block *nb, u32 reboot; /* - * Unlock the SLCR then reset the system. - * Note that this seems to require raw i/o - * functions or there's a lockup? - */ - zynq_slcr_unlock(); - - /* * Clear 0x0F000000 bits of reboot status register to workaround * the FSBL not loading the bitstream after soft-reboot * This is a temporary solution until we know more.
--
2.3.3