diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-03 14:03:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:18 +0100 |
| commit | ff84ded26525adb4c0dcef3a4d590b0d08967293 (patch) | |
| tree | 658f1cd803067b7a13a536ddb864580c4dd8140a /arch/arm/mach-s3c64xx/common.c | |
| parent | ARM: 7265/1: restart: S3C24XX: use new restart hook (diff) | |
| download | linux-ff84ded26525adb4c0dcef3a4d590b0d08967293.tar.xz linux-ff84ded26525adb4c0dcef3a4d590b0d08967293.zip | |
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/common.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/common.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 8ae5b16cc4f5..35182ba049da 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -44,6 +44,7 @@ #include <plat/irq-vic-timer.h> #include <plat/regs-irqtype.h> #include <plat/regs-serial.h> +#include <plat/watchdog-reset.h> #include "common.h" @@ -373,3 +374,12 @@ static int __init s3c64xx_init_irq_eint(void) return 0; } arch_initcall(s3c64xx_init_irq_eint); + +void s3c64xx_restart(char mode, const char *cmd) +{ + if (mode != 's') + arch_wdt_reset(); + + /* if all else fails, or mode was for soft, jump to 0 */ + soft_restart(0); +} |