reboot: arm: change reboot_mode to use enum reboot_mode

[cascardo/linux.git] / arch / arm / mach-bcm2835 / bcm2835.c

diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index 6f57859..40686d7 100644 (file)
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -23,8 +23,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/bcm2835_soc.h>
-
 #define PM_RSTC                                0x1c
 #define PM_RSTS                                0x20
 #define PM_WDOG                                0x24
@@ -34,6 +32,10 @@
 #define PM_RSTC_WRCFG_FULL_RESET       0x00000020
 #define PM_RSTS_HADWRH_SET             0x00000040
 
+#define BCM2835_PERIPH_PHYS    0x20000000
+#define BCM2835_PERIPH_VIRT    0xf0000000
+#define BCM2835_PERIPH_SIZE    SZ_16M
+
 static void __iomem *wdt_regs;
 
 /*
@@ -51,7 +53,7 @@ static void bcm2835_setup_restart(void)
        WARN(!wdt_regs, "failed to remap watchdog regs");
 }
 
-static void bcm2835_restart(char mode, const char *cmd)
+static void bcm2835_restart(enum reboot_mode mode, const char *cmd)
 {
        u32 val;
 
@@ -89,7 +91,7 @@ static void bcm2835_power_off(void)
        writel_relaxed(val, wdt_regs + PM_RSTS);
 
        /* Continue with normal reset mechanism */
-       bcm2835_restart(0, "");
+       bcm2835_restart(REBOOT_HARD, "");
 }
 
 static struct map_desc io_map __initdata = {