diff options
| author | Josh Cartwright <joshc@ni.com> | 2015-03-19 08:33:53 -0500 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-05-18 14:46:37 +0200 |
| commit | ef6ca1a84a3da9bf45d31399090153e00fc6cd68 (patch) | |
| tree | c71dfde759d84875387a6e90d466ad05bfbd5793 | |
| parent | 64e686176007de9b9aa735b71e8fa1c2979a00ce (diff) | |
| download | linux-ef6ca1a84a3da9bf45d31399090153e00fc6cd68.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-zynq/slcr.c | 7 |
1 files changed, 0 insertions, 7 deletions
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 @@ -108,13 +108,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. |