diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-19 16:34:45 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:57:49 +0200 |
| commit | 4b28e101284850de9d139362057fdc09c494570c (patch) | |
| tree | dbc73bbf98191490413dd4ea0970edd684ce51d1 /arch | |
| parent | 5c71151d51473413257c88837223006d8754f588 (diff) | |
ARM: sa1100: clear reset status prior to reboot
commit da60626e7d02a4f385cae80e450afc8b07035368 upstream.
Clear the current reset status prior to rebooting the platform. This
adds the bit missing from 04fef228fb00 ("[ARM] pxa: introduce
reset_status and clear_reset_status for driver's usage").
Fixes: 04fef228fb00 ("[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 9db3e98e8..4983b1149 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -30,6 +30,7 @@ #include <mach/hardware.h> #include <mach/irqs.h> +#include <mach/reset.h> #include "generic.h" @@ -133,6 +134,7 @@ static void sa1100_power_off(void) void sa11x0_restart(char mode, const char *cmd) { + clear_reset_status(RESET_STATUS_ALL); if (mode == 's') { /* Jump into ROM at address 0 */ soft_restart(0); |