Skip to content

Commit

Permalink
ARM: sa1100: clear reset status prior to reboot
Browse files Browse the repository at this point in the history
BugLink: http://bugs.launchpad.net/bugs/1631468

commit da60626 upstream.

Clear the current reset status prior to rebooting the platform.  This
adds the bit missing from 04fef22 ("[ARM] pxa: introduce
reset_status and clear_reset_status for driver's usage").

Fixes: 04fef22 ("[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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  • Loading branch information
Russell King authored and Seth Forshee committed Oct 20, 2016
1 parent fa9937f commit e8fcad0
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/arm/mach-sa1100/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <mach/hardware.h>
#include <mach/irqs.h>
#include <mach/reset.h>

#include "generic.h"
#include <clocksource/pxa.h>
Expand Down Expand Up @@ -95,6 +96,8 @@ static void sa1100_power_off(void)

void sa11x0_restart(enum reboot_mode mode, const char *cmd)
{
clear_reset_status(RESET_STATUS_ALL);

if (mode == REBOOT_SOFT) {
/* Jump into ROM at address 0 */
soft_restart(0);
Expand Down

0 comments on commit e8fcad0

Please sign in to comment.