diff options
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r-- | arch/arm/mach-spear/generic.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear/restart.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h index a9fd45362fee..904f2c907b46 100644 --- a/arch/arm/mach-spear/generic.h +++ b/arch/arm/mach-spear/generic.h | |||
@@ -16,6 +16,8 @@ | |||
16 | #include <linux/dmaengine.h> | 16 | #include <linux/dmaengine.h> |
17 | #include <linux/amba/pl08x.h> | 17 | #include <linux/amba/pl08x.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/reboot.h> | ||
20 | |||
19 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
20 | 22 | ||
21 | extern void spear13xx_timer_init(void); | 23 | extern void spear13xx_timer_init(void); |
@@ -32,7 +34,7 @@ void __init spear6xx_clk_init(void __iomem *misc_base); | |||
32 | void __init spear13xx_map_io(void); | 34 | void __init spear13xx_map_io(void); |
33 | void __init spear13xx_l2x0_init(void); | 35 | void __init spear13xx_l2x0_init(void); |
34 | 36 | ||
35 | void spear_restart(char, const char *); | 37 | void spear_restart(enum reboot_mode, const char *); |
36 | 38 | ||
37 | void spear13xx_secondary_startup(void); | 39 | void spear13xx_secondary_startup(void); |
38 | void __cpuinit spear13xx_cpu_die(unsigned int cpu); | 40 | void __cpuinit spear13xx_cpu_die(unsigned int cpu); |
diff --git a/arch/arm/mach-spear/restart.c b/arch/arm/mach-spear/restart.c index 2b44500bb718..ce5e098c4888 100644 --- a/arch/arm/mach-spear/restart.c +++ b/arch/arm/mach-spear/restart.c | |||
@@ -12,14 +12,15 @@ | |||
12 | */ | 12 | */ |
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/amba/sp810.h> | 14 | #include <linux/amba/sp810.h> |
15 | #include <linux/reboot.h> | ||
15 | #include <asm/system_misc.h> | 16 | #include <asm/system_misc.h> |
16 | #include <mach/spear.h> | 17 | #include <mach/spear.h> |
17 | #include "generic.h" | 18 | #include "generic.h" |
18 | 19 | ||
19 | #define SPEAR13XX_SYS_SW_RES (VA_MISC_BASE + 0x204) | 20 | #define SPEAR13XX_SYS_SW_RES (VA_MISC_BASE + 0x204) |
20 | void spear_restart(char mode, const char *cmd) | 21 | void spear_restart(enum reboot_mode mode, const char *cmd) |
21 | { | 22 | { |
22 | if (mode == 's') { | 23 | if (mode == REBOOT_SOFT) { |
23 | /* software reset, Jump into ROM at address 0 */ | 24 | /* software reset, Jump into ROM at address 0 */ |
24 | soft_restart(0); | 25 | soft_restart(0); |
25 | } else { | 26 | } else { |