aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-12-22 17:34:25 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:19 -0500
commit73aed8b9493f98edaabe4395c4043c4d3bccf7e1 (patch)
tree84b8f156518143233b6d424e5ea9f267bb7ccb19 /arch/arm/mach-s5p64x0
parentff84ded26525adb4c0dcef3a4d590b0d08967293 (diff)
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>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r--arch/arm/mach-s5p64x0/common.c9
-rw-r--r--arch/arm/mach-s5p64x0/common.h2
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6440.c1
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6450.c1
4 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index af02dc34769d..b7555a0fb0fb 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -45,6 +45,7 @@
45#include <plat/gpio-cfg.h> 45#include <plat/gpio-cfg.h>
46#include <plat/regs-irqtype.h> 46#include <plat/regs-irqtype.h>
47#include <plat/regs-serial.h> 47#include <plat/regs-serial.h>
48#include <plat/watchdog-reset.h>
48 49
49#include "common.h" 50#include "common.h"
50 51
@@ -457,3 +458,11 @@ static int __init s5p64x0_init_irq_eint(void)
457 return ret; 458 return ret;
458} 459}
459arch_initcall(s5p64x0_init_irq_eint); 460arch_initcall(s5p64x0_init_irq_eint);
461
462void s5p64x0_restart(char mode, const char *cmd)
463{
464 if (mode != 's')
465 arch_wdt_reset();
466
467 soft_restart(0);
468}
diff --git a/arch/arm/mach-s5p64x0/common.h b/arch/arm/mach-s5p64x0/common.h
index 8a1eca5f4ec9..f8a60fdc5884 100644
--- a/arch/arm/mach-s5p64x0/common.h
+++ b/arch/arm/mach-s5p64x0/common.h
@@ -22,6 +22,8 @@ void s5p6440_setup_clocks(void);
22void s5p6450_register_clocks(void); 22void s5p6450_register_clocks(void);
23void s5p6450_setup_clocks(void); 23void s5p6450_setup_clocks(void);
24 24
25void s5p64x0_restart(char mode, const char *cmd);
26
25#ifdef CONFIG_CPU_S5P6440 27#ifdef CONFIG_CPU_S5P6440
26 28
27extern int s5p64x0_init(void); 29extern int s5p64x0_init(void);
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 646fc995a109..14ace6d282e6 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")
246 .map_io = smdk6440_map_io, 246 .map_io = smdk6440_map_io,
247 .init_machine = smdk6440_machine_init, 247 .init_machine = smdk6440_machine_init,
248 .timer = &s5p_timer, 248 .timer = &s5p_timer,
249 .restart = s5p64x0_restart,
249MACHINE_END 250MACHINE_END
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 90463ddcbe39..924478a19b9a 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")
266 .map_io = smdk6450_map_io, 266 .map_io = smdk6450_map_io,
267 .init_machine = smdk6450_machine_init, 267 .init_machine = smdk6450_machine_init,
268 .timer = &s5p_timer, 268 .timer = &s5p_timer,
269 .restart = s5p64x0_restart,
269MACHINE_END 270MACHINE_END