diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-03 19:50:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:09 +0000 |
| commit | da908260f21225d6f19ab29cfa401e550000eeae (patch) | |
| tree | 6416ee1ee5a49b96c41c3bcb90aadb35a877222f /arch | |
| parent | 6ca6ff972d5b045de1012a4046b4de5405dc4c7a (diff) | |
| download | blackbird-obmc-linux-da908260f21225d6f19ab29cfa401e550000eeae.tar.gz blackbird-obmc-linux-da908260f21225d6f19ab29cfa401e550000eeae.zip | |
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')
| -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) arch_initcall(ebsa110_init); +static void ebsa110_restart(char mode, const char *cmd) +{ + soft_restart(0x80000000); +} + MACHINE_START(EBSA110, "EBSA110") /* Maintainer: Russell King */ .atag_offset = 0x400, @@ -287,4 +292,5 @@ MACHINE_START(EBSA110, "EBSA110") .map_io = ebsa110_map_io, .init_irq = ebsa110_init_irq, .timer = &ebsa110_timer, + .restart = ebsa110_restart, 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) asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc"); } -#define arch_reset(mode, cmd) soft_restart(0x80000000) +static inline void arch_reset(char mode, const char *cmd) +{ +} #endif |
