From 7bba096dc1fe993ead156a018f7c08333deaad27 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Thu, 22 Dec 2011 23:34:25 +0100
Subject: [PATCH] --- yaml --- r: 279983 b: refs/heads/master c:
 73aed8b9493f98edaabe4395c4043c4d3bccf7e1 h: refs/heads/master i:   279981:
 2093b8fb66fc36d94200f54b5fc0ecf559ba012d   279979:
 2bf7a85b85ff59a332673e1b85b0763dec271d03   279975:
 1ef61e68ea54baca6bdf8759d523760d629872cb   279967:
 4935e7aae1cc9cb7e3d32e15c6c49509ef7ba111 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-s5p64x0/common.c        | 9 +++++++++
 trunk/arch/arm/mach-s5p64x0/common.h        | 2 ++
 trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 +
 trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 +
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f0f2b96d8cd..a66d98c7ca16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff84ded26525adb4c0dcef3a4d590b0d08967293
+refs/heads/master: 73aed8b9493f98edaabe4395c4043c4d3bccf7e1
diff --git a/trunk/arch/arm/mach-s5p64x0/common.c b/trunk/arch/arm/mach-s5p64x0/common.c
index af02dc34769d..b7555a0fb0fb 100644
--- a/trunk/arch/arm/mach-s5p64x0/common.c
+++ b/trunk/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/trunk/arch/arm/mach-s5p64x0/common.h b/trunk/arch/arm/mach-s5p64x0/common.h
index 8a1eca5f4ec9..f8a60fdc5884 100644
--- a/trunk/arch/arm/mach-s5p64x0/common.h
+++ b/trunk/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/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c b/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 646fc995a109..14ace6d282e6 100644
--- a/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/trunk/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/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c b/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 90463ddcbe39..924478a19b9a 100644
--- a/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/trunk/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