]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: S5P: Add System define for arch_reset()
authorJongpill Lee <boyko.lee@samsung.com>
Wed, 23 Jun 2010 12:31:21 +0000 (21:31 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 5 Aug 2010 09:30:22 +0000 (18:30 +0900)
This patch adds system define for arch_reset() using Watchdog reset.
And adds IO mapping for using WDT.

Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/plat-s5p/cpu.c
arch/arm/plat-s5p/include/plat/system-reset.h [new file with mode: 0644]

index 75cb8c37ca2cf437a79244729d99b5121a0bd7af..1ab55e82587bb1decaf2e6220053e89e704487b8 100644 (file)
@@ -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/arch/arm/plat-s5p/include/plat/system-reset.h b/arch/arm/plat-s5p/include/plat/system-reset.h
new file mode 100644 (file)
index 0000000..7f76a16
--- /dev/null
@@ -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();
+}