diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 11:03:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:14 +0100 |
| commit | cb15dff4795932b98459da13dd3dd3693c6dd104 (patch) | |
| tree | 198c50aa822f2dcceb0799ecb584b61318de2ae8 /arch/arm/mach-kirkwood/include/mach | |
| parent | ARM: restart: ixp4xx: use new restart hook (diff) | |
| download | linux-cb15dff4795932b98459da13dd3dd3693c6dd104.tar.xz linux-cb15dff4795932b98459da13dd3dd3693c6dd104.zip | |
ARM: restart: kirkwood: use new restart hook
Hook these platforms restart code into the new restart hook rather than
using arch_reset().
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/system.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/system.h b/arch/arm/mach-kirkwood/include/mach/system.h index 7568e95d279b..8a94d9739136 100644 --- a/arch/arm/mach-kirkwood/include/mach/system.h +++ b/arch/arm/mach-kirkwood/include/mach/system.h @@ -9,8 +9,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(); @@ -18,19 +16,6 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - /* - * Enable soft reset to assert RSTOUTn. - */ - writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK); - - /* - * Assert soft reset. - */ - writel(SOFT_RESET, SYSTEM_SOFT_RESET); - - while (1) - ; } - #endif |