diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-03 15:50:44 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:09 -0500 |
commit | da908260f21225d6f19ab29cfa401e550000eeae (patch) | |
tree | 6416ee1ee5a49b96c41c3bcb90aadb35a877222f /arch/arm/mach-ebsa110 | |
parent | 6ca6ff972d5b045de1012a4046b4de5405dc4c7a (diff) |
ARM: restart: ebsa110: use new restart hook
Hook the EBSA110 platform restart code into the new restart hook rather
than using arch_reset().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ebsa110')
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/system.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index ce3ed244c4b0..294aad07f7a0 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -278,6 +278,11 @@ static int __init ebsa110_init(void) | |||
278 | 278 | ||
279 | arch_initcall(ebsa110_init); | 279 | arch_initcall(ebsa110_init); |
280 | 280 | ||
281 | static void ebsa110_restart(char mode, const char *cmd) | ||
282 | { | ||
283 | soft_restart(0x80000000); | ||
284 | } | ||
285 | |||
281 | MACHINE_START(EBSA110, "EBSA110") | 286 | MACHINE_START(EBSA110, "EBSA110") |
282 | /* Maintainer: Russell King */ | 287 | /* Maintainer: Russell King */ |
283 | .atag_offset = 0x400, | 288 | .atag_offset = 0x400, |
@@ -287,4 +292,5 @@ MACHINE_START(EBSA110, "EBSA110") | |||
287 | .map_io = ebsa110_map_io, | 292 | .map_io = ebsa110_map_io, |
288 | .init_irq = ebsa110_init_irq, | 293 | .init_irq = ebsa110_init_irq, |
289 | .timer = &ebsa110_timer, | 294 | .timer = &ebsa110_timer, |
295 | .restart = ebsa110_restart, | ||
290 | MACHINE_END | 296 | MACHINE_END |
diff --git a/arch/arm/mach-ebsa110/include/mach/system.h b/arch/arm/mach-ebsa110/include/mach/system.h index 0d5df72a03f6..574e63385d0e 100644 --- a/arch/arm/mach-ebsa110/include/mach/system.h +++ b/arch/arm/mach-ebsa110/include/mach/system.h | |||
@@ -34,6 +34,8 @@ static inline void arch_idle(void) | |||
34 | asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc"); | 34 | asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc"); |
35 | } | 35 | } |
36 | 36 | ||
37 | #define arch_reset(mode, cmd) soft_restart(0x80000000) | 37 | static inline void arch_reset(char mode, const char *cmd) |
38 | { | ||
39 | } | ||
38 | 40 | ||
39 | #endif | 41 | #endif |