From: Jaya Kumar <jayakumar.lkml@gmail.com>
Date: Tue, 11 Nov 2008 11:17:05 +0000 (+0100)
Subject: [ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
X-Git-Tag: firefly_0821_release~16725^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28105fda1ecadfa7c827b22d323c169f19dc04b0;p=firefly-linux-kernel-4.4.55.git

[ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings

This patch makes do_hw_reset the default reboot behavior when nothing
else matches. This restores reboot functionality on gumstix basix
devices where reboot=cold is the default boot argument.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c
index 1b2af575c40f..00b2dc2a1074 100644
--- a/arch/arm/mach-pxa/reset.c
+++ b/arch/arm/mach-pxa/reset.c
@@ -90,12 +90,13 @@ void arch_reset(char mode)
 		/* Jump into ROM at address 0 */
 		cpu_reset(0);
 		break;
-	case 'h':
-		do_hw_reset();
-		break;
 	case 'g':
 		do_gpio_reset();
 		break;
+	case 'h':
+	default:
+		do_hw_reset();
+		break;
 	}
 }