From 4cbd93fc290ec451df98c350c942270053497cdf Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Thu, 22 Dec 2011 23:35:21 +0100
Subject: [PATCH] --- yaml --- r: 279984 b: refs/heads/master c:
 5497d2e1d63bfdd707d4b19651c4127545ccd135 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-s5pc100/common.c        | 9 +++++++++
 trunk/arch/arm/mach-s5pc100/common.h        | 2 ++
 trunk/arch/arm/mach-s5pc100/mach-smdkc100.c | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a66d98c7ca16..d07f24d101a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73aed8b9493f98edaabe4395c4043c4d3bccf7e1
+refs/heads/master: 5497d2e1d63bfdd707d4b19651c4127545ccd135
diff --git a/trunk/arch/arm/mach-s5pc100/common.c b/trunk/arch/arm/mach-s5pc100/common.c
index e6eadacc108c..73594a2fcf26 100644
--- a/trunk/arch/arm/mach-s5pc100/common.c
+++ b/trunk/arch/arm/mach-s5pc100/common.c
@@ -45,6 +45,7 @@
 #include <plat/iic-core.h>
 #include <plat/onenand-core.h>
 #include <plat/regs-serial.h>
+#include <plat/watchdog-reset.h>
 
 #include "common.h"
 
@@ -221,3 +222,11 @@ void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
 }
+
+void s5pc100_restart(char mode, const char *cmd)
+{
+	if (mode != 's')
+		arch_wdt_reset();
+
+	soft_restart(0);
+}
diff --git a/trunk/arch/arm/mach-s5pc100/common.h b/trunk/arch/arm/mach-s5pc100/common.h
index 4822b872a468..9fbd3ae2b401 100644
--- a/trunk/arch/arm/mach-s5pc100/common.h
+++ b/trunk/arch/arm/mach-s5pc100/common.h
@@ -18,6 +18,8 @@ void s5pc100_init_irq(void);
 void s5pc100_register_clocks(void);
 void s5pc100_setup_clocks(void);
 
+void s5pc100_restart(char mode, const char *cmd);
+
 #ifdef CONFIG_CPU_S5PC100
 
 extern  int s5pc100_init(void);
diff --git a/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c b/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
index e1c41772c7bd..ead292ce1e0d 100644
--- a/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -254,4 +254,5 @@ MACHINE_START(SMDKC100, "SMDKC100")
 	.map_io		= smdkc100_map_io,
 	.init_machine	= smdkc100_machine_init,
 	.timer		= &s3c24xx_timer,
+	.restart	= s5pc100_restart,
 MACHINE_END