diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-highbank/core.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-highbank/include/mach/system.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-highbank/system.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 7e33fc94cd1e..d8e2d0be64ac 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h | |||
@@ -1,5 +1,6 @@ | |||
1 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); | 1 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); |
2 | extern void highbank_clocks_init(void); | 2 | extern void highbank_clocks_init(void); |
3 | extern void highbank_restart(char, const char *); | ||
3 | extern void __iomem *scu_base_addr; | 4 | extern void __iomem *scu_base_addr; |
4 | #ifdef CONFIG_DEBUG_HIGHBANK_UART | 5 | #ifdef CONFIG_DEBUG_HIGHBANK_UART |
5 | extern void highbank_lluart_map_io(void); | 6 | extern void highbank_lluart_map_io(void); |
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 88660d500f5b..4508384f100f 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -146,4 +146,5 @@ DT_MACHINE_START(HIGHBANK, "Highbank") | |||
146 | .timer = &highbank_timer, | 146 | .timer = &highbank_timer, |
147 | .init_machine = highbank_init, | 147 | .init_machine = highbank_init, |
148 | .dt_compat = highbank_match, | 148 | .dt_compat = highbank_match, |
149 | .restart = highbank_restart, | ||
149 | MACHINE_END | 150 | MACHINE_END |
diff --git a/arch/arm/mach-highbank/include/mach/system.h b/arch/arm/mach-highbank/include/mach/system.h index 7e8192296cae..0754c79114b0 100644 --- a/arch/arm/mach-highbank/include/mach/system.h +++ b/arch/arm/mach-highbank/include/mach/system.h | |||
@@ -21,6 +21,8 @@ static inline void arch_idle(void) | |||
21 | cpu_do_idle(); | 21 | cpu_do_idle(); |
22 | } | 22 | } |
23 | 23 | ||
24 | extern void arch_reset(char mode, const char *cmd); | 24 | static inline void arch_reset(char mode, const char *cmd) |
25 | { | ||
26 | } | ||
25 | 27 | ||
26 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c index 53f0c4c5ef1c..82c27230d4a9 100644 --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "core.h" | 20 | #include "core.h" |
21 | #include "sysregs.h" | 21 | #include "sysregs.h" |
22 | 22 | ||
23 | void arch_reset(char mode, const char *cmd) | 23 | void highbank_restart(char mode, const char *cmd) |
24 | { | 24 | { |
25 | if (mode == 'h') | 25 | if (mode == 'h') |
26 | hignbank_set_pwr_hard_reset(); | 26 | hignbank_set_pwr_hard_reset(); |