From ef6ca1a84a3da9bf45d31399090153e00fc6cd68 Mon Sep 17 00:00:00 2001 From: Josh Cartwright Date: Thu, 19 Mar 2015 08:33:53 -0500 Subject: 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 Signed-off-by: Michal Simek --- arch/arm/mach-zynq/slcr.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'arch/arm/mach-zynq') diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 94a17be98822..26320ebf3493 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/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 -- cgit v1.2.3-59-g8ed1b