diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-03 08:02:03 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:18 -0500 |
commit | b27b072791dc83324f180007b03ac0b5a8455a2d (patch) | |
tree | 82a5a03cc0a76399f5a3d86be8db67de998ac6be /arch/arm/mach-s3c2410/s3c2410.c | |
parent | 57538975917d4b0c467dbdd21328337f059bc027 (diff) |
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 @@ | |||
42 | #include <plat/clock.h> | 42 | #include <plat/clock.h> |
43 | #include <plat/pll.h> | 43 | #include <plat/pll.h> |
44 | #include <plat/pm.h> | 44 | #include <plat/pm.h> |
45 | #include <plat/watchdog-reset.h> | ||
45 | 46 | ||
46 | #include <plat/gpio-core.h> | 47 | #include <plat/gpio-core.h> |
47 | #include <plat/gpio-cfg.h> | 48 | #include <plat/gpio-cfg.h> |
@@ -183,3 +184,15 @@ int __init s3c2410a_init(void) | |||
183 | s3c2410_sysdev.cls = &s3c2410a_sysclass; | 184 | s3c2410_sysdev.cls = &s3c2410a_sysclass; |
184 | return s3c2410_init(); | 185 | return s3c2410_init(); |
185 | } | 186 | } |
187 | |||
188 | void s3c2410_restart(char mode, const char *cmd) | ||
189 | { | ||
190 | if (mode == 's') { | ||
191 | soft_restart(0); | ||
192 | } | ||
193 | |||
194 | arch_wdt_reset(); | ||
195 | |||
196 | /* we'll take a jump through zero as a poor second */ | ||
197 | soft_restart(0); | ||
198 | } | ||