diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 11:16:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:12 +0000 |
| commit | 00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3 (patch) | |
| tree | 4ed99fcc10087a4681a76e4722e717d945d15f9b | |
| parent | 0d68370b246dad8c4a94c3a49d700622664ad89a (diff) | |
| download | op-kernel-dev-00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3.zip op-kernel-dev-00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3.tar.gz | |
ARM: restart: highbank: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -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 7e33fc9..d8e2d0b 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h @@ -1,5 +1,6 @@ extern void highbank_set_cpu_jump(int cpu, void *jump_addr); extern void highbank_clocks_init(void); +extern void highbank_restart(char, const char *); extern void __iomem *scu_base_addr; #ifdef CONFIG_DEBUG_HIGHBANK_UART extern void highbank_lluart_map_io(void); diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 88660d5..4508384 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -146,4 +146,5 @@ DT_MACHINE_START(HIGHBANK, "Highbank") .timer = &highbank_timer, .init_machine = highbank_init, .dt_compat = highbank_match, + .restart = highbank_restart, MACHINE_END diff --git a/arch/arm/mach-highbank/include/mach/system.h b/arch/arm/mach-highbank/include/mach/system.h index 7e81922..0754c79 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) cpu_do_idle(); } -extern void arch_reset(char mode, const char *cmd); +static inline void arch_reset(char mode, const char *cmd) +{ +} #endif diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c index 53f0c4c..82c27230 100644 --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c @@ -20,7 +20,7 @@ #include "core.h" #include "sysregs.h" -void arch_reset(char mode, const char *cmd) +void highbank_restart(char mode, const char *cmd) { if (mode == 'h') hignbank_set_pwr_hard_reset(); |
