From 503e4fc94354222e7b11c79cbf30608188c86d9b Mon Sep 17 00:00:00 2001
From: Jongpill Lee <boyko.lee@samsung.com>
Date: Wed, 23 Jun 2010 21:31:21 +0900
Subject: [PATCH] --- yaml --- r: 208775 b: refs/heads/master c:
 d7f1e82ac982dead64d2b3825b7d33db3023a514 h: refs/heads/master i:   208773:
 9670c3629665fdcdcc33969cb1cadf532f81e7be   208771:
 537d122cc65766df47a19388101f0fed82554f78   208767:
 79798e218bb6c35ec2f9bb40b52941734c991729 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/plat-s5p/cpu.c                 |  5 ++++
 .../arm/plat-s5p/include/plat/system-reset.h  | 24 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/plat-s5p/include/plat/system-reset.h

diff --git a/[refs] b/[refs]
index 97a2aa433457..cff4171c2694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8def0857f93413db795ce3586bcc3c3eaae7088
+refs/heads/master: d7f1e82ac982dead64d2b3825b7d33db3023a514
diff --git a/trunk/arch/arm/plat-s5p/cpu.c b/trunk/arch/arm/plat-s5p/cpu.c
index 75cb8c37ca2c..1ab55e82587b 100644
--- a/trunk/arch/arm/plat-s5p/cpu.c
+++ b/trunk/arch/arm/plat-s5p/cpu.c
@@ -103,6 +103,11 @@ static struct map_desc s5p_iodesc[] __initdata = {
 		.pfn		= __phys_to_pfn(S5P_PA_GPIO),
 		.length		= SZ_4K,
 		.type		= MT_DEVICE,
+	}, {
+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,
+		.pfn		= __phys_to_pfn(S3C_PA_WDT),
+		.length		= SZ_4K,
+		.type		= MT_DEVICE,
 	},
 };
 
diff --git a/trunk/arch/arm/plat-s5p/include/plat/system-reset.h b/trunk/arch/arm/plat-s5p/include/plat/system-reset.h
new file mode 100644
index 000000000000..7f76a164c20c
--- /dev/null
+++ b/trunk/arch/arm/plat-s5p/include/plat/system-reset.h
@@ -0,0 +1,24 @@
+/* linux/arch/arm/plat-s5p/include/plat/system-reset.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * Based on arch/arm/mach-s3c2410/include/mach/system-reset.h
+ *
+ * S5P - System define for arch_reset()
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <plat/watchdog-reset.h>
+
+static void arch_reset(char mode, const char *cmd)
+{
+	/* Perform reset using Watchdog reset.
+	 * SWRESET support will be added later.
+	 */
+
+	arch_wdt_reset();
+}