aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2013-07-08 19:01:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:29 -0400
commit7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (patch)
treebc5b3c1c6021e19e51f7f5afe5fb0fbbaef9f7a3 /arch/arm/mach-bcm2835
parent16d6d5b00ee75307bab7e4ede9452c97b28f30e2 (diff)
reboot: arm: change reboot_mode to use enum reboot_mode
Preparing to move the parsing of reboot= to generic kernel code forces the change in reboot_mode handling to use the enum. [akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c] Signed-off-by: Robin Holt <holt@sgi.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Russ Anderson <rja@sgi.com> Cc: Robin Holt <holt@sgi.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-bcm2835')
-rw-r--r--arch/arm/mach-bcm2835/bcm2835.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index 740fa9ebe249..40686d7ef500 100644
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -53,7 +53,7 @@ static void bcm2835_setup_restart(void)
53 WARN(!wdt_regs, "failed to remap watchdog regs"); 53 WARN(!wdt_regs, "failed to remap watchdog regs");
54} 54}
55 55
56static void bcm2835_restart(char mode, const char *cmd) 56static void bcm2835_restart(enum reboot_mode mode, const char *cmd)
57{ 57{
58 u32 val; 58 u32 val;
59 59
@@ -91,7 +91,7 @@ static void bcm2835_power_off(void)
91 writel_relaxed(val, wdt_regs + PM_RSTS); 91 writel_relaxed(val, wdt_regs + PM_RSTS);
92 92
93 /* Continue with normal reset mechanism */ 93 /* Continue with normal reset mechanism */
94 bcm2835_restart(0, ""); 94 bcm2835_restart(REBOOT_HARD, "");
95} 95}
96 96
97static struct map_desc io_map __initdata = { 97static struct map_desc io_map __initdata = {