diff options
| author | Russell King | 2011-11-05 11:09:15 +0100 |
|---|---|---|
| committer | Russell King | 2012-01-05 13:57:15 +0100 |
| commit | 9635f9cd49b72bddb7e40fcbc151240677b5cf5e (patch) | |
| tree | f0de1d54b56c74b775c688adc986d2d1307b8f3a /arch/arm/mach-mv78xx0/include | |
| parent | ARM: restart: mmp: use new restart hook (diff) | |
| download | kernel-qcow2-linux-9635f9cd49b72bddb7e40fcbc151240677b5cf5e.tar.gz kernel-qcow2-linux-9635f9cd49b72bddb7e40fcbc151240677b5cf5e.tar.xz kernel-qcow2-linux-9635f9cd49b72bddb7e40fcbc151240677b5cf5e.zip | |
ARM: restart: mv78xx0: 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-mv78xx0/include')
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/system.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h index 66e7ce4e90bd..1ae3585f18d1 100644 --- a/arch/arm/mach-mv78xx0/include/mach/system.h +++ b/arch/arm/mach-mv78xx0/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,18 +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) - ; } |