diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-22 23:34:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:19 +0000 |
| commit | 73aed8b9493f98edaabe4395c4043c4d3bccf7e1 (patch) | |
| tree | 84b8f156518143233b6d424e5ea9f267bb7ccb19 | |
| parent | ff84ded26525adb4c0dcef3a4d590b0d08967293 (diff) | |
| download | linux-3.10-73aed8b9493f98edaabe4395c4043c4d3bccf7e1.tar.gz linux-3.10-73aed8b9493f98edaabe4395c4043c4d3bccf7e1.tar.bz2 linux-3.10-73aed8b9493f98edaabe4395c4043c4d3bccf7e1.zip | |
ARM: 7250/1: restart: S5P64X0: 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>
| -rw-r--r-- | arch/arm/mach-s5p64x0/common.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c index af02dc34769..b7555a0fb0f 100644 --- a/arch/arm/mach-s5p64x0/common.c +++ b/arch/arm/mach-s5p64x0/common.c @@ -45,6 +45,7 @@ #include <plat/gpio-cfg.h> #include <plat/regs-irqtype.h> #include <plat/regs-serial.h> +#include <plat/watchdog-reset.h> #include "common.h" @@ -457,3 +458,11 @@ static int __init s5p64x0_init_irq_eint(void) return ret; } arch_initcall(s5p64x0_init_irq_eint); + +void s5p64x0_restart(char mode, const char *cmd) +{ + if (mode != 's') + arch_wdt_reset(); + + soft_restart(0); +} diff --git a/arch/arm/mach-s5p64x0/common.h b/arch/arm/mach-s5p64x0/common.h index 8a1eca5f4ec..f8a60fdc588 100644 --- a/arch/arm/mach-s5p64x0/common.h +++ b/arch/arm/mach-s5p64x0/common.h @@ -22,6 +22,8 @@ void s5p6440_setup_clocks(void); void s5p6450_register_clocks(void); void s5p6450_setup_clocks(void); +void s5p64x0_restart(char mode, const char *cmd); + #ifdef CONFIG_CPU_S5P6440 extern int s5p64x0_init(void); diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index 646fc995a10..14ace6d282e 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c @@ -246,4 +246,5 @@ MACHINE_START(SMDK6440, "SMDK6440") .map_io = smdk6440_map_io, .init_machine = smdk6440_machine_init, .timer = &s5p_timer, + .restart = s5p64x0_restart, MACHINE_END diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 90463ddcbe3..924478a19b9 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c @@ -266,4 +266,5 @@ MACHINE_START(SMDK6450, "SMDK6450") .map_io = smdk6450_map_io, .init_machine = smdk6450_machine_init, .timer = &s5p_timer, + .restart = s5p64x0_restart, MACHINE_END |