From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55195 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751154AbcJENMp (ORCPT ); Wed, 5 Oct 2016 09:12:45 -0400 Subject: Patch "ARM: sa1100: clear reset status prior to reboot" has been added to the 4.7-stable tree To: rmk+kernel@armlinux.org.uk, gregkh@linuxfoundation.org Cc: , From: Date: Wed, 05 Oct 2016 15:10:07 +0200 Message-ID: <1475673007125143@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ARM: sa1100: clear reset status prior to reboot to the 4.7-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-sa1100-clear-reset-status-prior-to-reboot.patch and it can be found in the queue-4.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From da60626e7d02a4f385cae80e450afc8b07035368 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 19 Aug 2016 16:34:45 +0100 Subject: ARM: sa1100: clear reset status prior to reboot From: Russell King 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 Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-sa1100/generic.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -34,6 +34,7 @@ #include #include +#include #include "generic.h" #include @@ -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); Patches currently in stable-queue which might be from rmk+kernel@armlinux.org.uk are queue-4.7/arm-sa1100-fix-3.6864mhz-clock.patch queue-4.7/pcmcia-ds-fix-suspend-resume.patch queue-4.7/arm-sa1100-register-clocks-early.patch queue-4.7/gpio-sa1100-fix-irq-probing-for-ucb1x00.patch queue-4.7/arm-sa1100-clear-reset-status-prior-to-reboot.patch queue-4.7/arm-sa1111-fix-pcmcia-suspend-resume.patch