aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 10:09:15 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:15 +0000
commit9635f9cd49b72bddb7e40fcbc151240677b5cf5e (patch)
treef0de1d54b56c74b775c688adc986d2d1307b8f3a /arch/arm/mach-mv78xx0/include
parent9854a38e371a153c7c4adb2cb7951c27befe0362 (diff)
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.h14
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 66e7ce4e90b..1ae3585f18d 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)
- ;
}