diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-03 14:02:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:18 +0100 |
| commit | b27b072791dc83324f180007b03ac0b5a8455a2d (patch) | |
| tree | 82a5a03cc0a76399f5a3d86be8db67de998ac6be /arch/arm/mach-s3c2410/s3c2410.c | |
| parent | ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to (diff) | |
| download | linux-b27b072791dc83324f180007b03ac0b5a8455a2d.tar.xz 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-s3c2410/s3c2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c index 3d7ebc557a72..489c826e92a7 100644 --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c @@ -42,6 +42,7 @@ #include <plat/clock.h> #include <plat/pll.h> #include <plat/pm.h> +#include <plat/watchdog-reset.h> #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> @@ -183,3 +184,15 @@ int __init s3c2410a_init(void) s3c2410_sysdev.cls = &s3c2410a_sysclass; return s3c2410_init(); } + +void s3c2410_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); +} |