summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 10:48:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 13:57:09 +0100
commit6ca6ff972d5b045de1012a4046b4de5405dc4c7a (patch)
tree8e6cf197b4f210c6a57f5877e3130d51db529541 /arch/arm/mach-dove/include
parentARM: 7190/1: restart: davinci: use new restart hook (diff)
downloadlinux-6ca6ff972d5b045de1012a4046b4de5405dc4c7a.tar.xz
linux-6ca6ff972d5b045de1012a4046b4de5405dc4c7a.zip
ARM: restart: dove: 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-dove/include')
-rw-r--r--arch/arm/mach-dove/include/mach/system.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-dove/include/mach/system.h b/arch/arm/mach-dove/include/mach/system.h
index 356afda56853..25a3a652f4bb 100644
--- a/arch/arm/mach-dove/include/mach/system.h
+++ b/arch/arm/mach-dove/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)
- ;
}