Commit ef6ca1a8 authored by Josh Cartwright's avatar Josh Cartwright Committed by Michal Simek

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: default avatarJosh Cartwright <joshc@ni.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 64e68617
...@@ -107,13 +107,6 @@ int zynq_slcr_system_restart(struct notifier_block *nb, ...@@ -107,13 +107,6 @@ int zynq_slcr_system_restart(struct notifier_block *nb,
{ {
u32 reboot; 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 * Clear 0x0F000000 bits of reboot status register to workaround
* the FSBL not loading the bitstream after soft-reboot * the FSBL not loading the bitstream after soft-reboot
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment