summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/s3c2440.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-01-03 14:02:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:18 +0000
commitb27b072791dc83324f180007b03ac0b5a8455a2d (patch)
tree82a5a03cc0a76399f5a3d86be8db67de998ac6be /arch/arm/mach-s3c2440/s3c2440.c
parent57538975917d4b0c467dbdd21328337f059bc027 (diff)
downloadlinux-b27b072791dc83324f180007b03ac0b5a8455a2d.tar.gz
linux-b27b072791dc83324f180007b03ac0b5a8455a2d.tar.bz2
linux-b27b072791dc83324f180007b03ac0b5a8455a2d.zip
ARM: 7265/1: restart: S3C24XX: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). And adds local header file, common.h in arch/arm/mach-s3c2410/ and arch/arm/mach-s3c2440/ directories. 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-s3c2440/s3c2440.c')
-rw-r--r--arch/arm/mach-s3c2440/s3c2440.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index 37f8cc6aabd4..42d73f1e0cef 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -35,6 +35,7 @@
#include <plat/cpu.h>
#include <plat/s3c244x.h>
#include <plat/pm.h>
+#include <plat/watchdog-reset.h>
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
@@ -73,3 +74,15 @@ void __init s3c2440_map_io(void)
s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;
}
+
+void s3c2440_restart(char mode, const char *cmd)
+{
+ if (mode == 's') {
+ soft_restart(0);
+ }
+
+ arch_wdt_reset();
+
+ /* we'll take a jump through zero as a poor second */
+ soft_restart(0);
+}