]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
authorJaya Kumar <jayakumar.lkml@gmail.com>
Tue, 11 Nov 2008 11:17:05 +0000 (12:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Nov 2008 14:05:41 +0000 (14:05 +0000)
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>
arch/arm/mach-pxa/reset.c

index 1b2af575c40fdacb47cba208a450a27a99375e1f..00b2dc2a10747b5f87d04d02f82d9f74bdd1b356 100644 (file)
@@ -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;
        }
 }