diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 11:13:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:16 +0100 |
| commit | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch) | |
| tree | 32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/include | |
| parent | ARM: restart: omap: use new restart hook (diff) | |
| download | linux-764cbcc2e3fa444c205b20b3d7908b06b60716ab.tar.xz linux-764cbcc2e3fa444c205b20b3d7908b06b60716ab.zip | |
ARM: restart: orion5x: use new restart hook
Hook these platforms restart code into the new restart hook rather than
using arch_reset().
In addition, convert calls to arm_machine_restart() to orion5x_restart()
to ensure that they continue to work as intended.
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-orion5x/include')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/system.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h index a1d6e46ab035..667767735144 100644 --- a/arch/arm/mach-orion5x/include/mach/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h @@ -11,8 +11,6 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <mach/bridge-regs.h> - static inline void arch_idle(void) { cpu_do_idle(); @@ -20,14 +18,6 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - /* - * Enable and issue soft reset - */ - orion5x_setbits(RSTOUTn_MASK, (1 << 2)); - orion5x_setbits(CPU_SOFT_RESET, 1); - mdelay(200); - orion5x_clrbits(CPU_SOFT_RESET, 1); } - #endif |