diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-03 08:03:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:18 -0500 |
commit | ff84ded26525adb4c0dcef3a4d590b0d08967293 (patch) | |
tree | 658f1cd803067b7a13a536ddb864580c4dd8140a /arch/arm/mach-s3c64xx/include/mach | |
parent | b27b072791dc83324f180007b03ac0b5a8455a2d (diff) |
ARM: 7266/1: restart: S3C64XX: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach')
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/system.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/system.h b/arch/arm/mach-s3c64xx/include/mach/system.h index d8ca5786ba25..51bc8eb046de 100644 --- a/arch/arm/mach-s3c64xx/include/mach/system.h +++ b/arch/arm/mach-s3c64xx/include/mach/system.h | |||
@@ -11,8 +11,6 @@ | |||
11 | #ifndef __ASM_ARCH_SYSTEM_H | 11 | #ifndef __ASM_ARCH_SYSTEM_H |
12 | #define __ASM_ARCH_SYSTEM_H __FILE__ | 12 | #define __ASM_ARCH_SYSTEM_H __FILE__ |
13 | 13 | ||
14 | #include <plat/watchdog-reset.h> | ||
15 | |||
16 | static void arch_idle(void) | 14 | static void arch_idle(void) |
17 | { | 15 | { |
18 | /* nothing here yet */ | 16 | /* nothing here yet */ |
@@ -20,11 +18,6 @@ static void arch_idle(void) | |||
20 | 18 | ||
21 | static void arch_reset(char mode, const char *cmd) | 19 | static void arch_reset(char mode, const char *cmd) |
22 | { | 20 | { |
23 | if (mode != 's') | ||
24 | arch_wdt_reset(); | ||
25 | |||
26 | /* if all else fails, or mode was for soft, jump to 0 */ | ||
27 | soft_restart(0); | ||
28 | } | 21 | } |
29 | 22 | ||
30 | #endif /* __ASM_ARCH_IRQ_H */ | 23 | #endif /* __ASM_ARCH_IRQ_H */ |