Эх сурвалжийг харах

ARM: zynq: Drop use of slcr_unlock in zynq_slcr_system_restart

The SLCR is unconditionally unlocked early on boot in zynq_slcr_init()
and not ever re-locked. As such, it is not necessary to explicitly unlock in
the restart codepath.

Signed-off-by: Josh Cartwright <joshc@ni.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Josh Cartwright 10 жил өмнө
parent
commit
ef6ca1a84a

+ 0 - 7
arch/arm/mach-zynq/slcr.c

@@ -107,13 +107,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