ARM: S5PV310: Add support Watchdog Timer

This patch adds support Watchdog Timer for S5PV310 and S5PC210.

Signed-off-by: Jemings Ko <jemings@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 83b4b0858bf62089458bdd1bbf88c04800b7a87c..fe3cf37c5dd5690ac0626286fa0634014c414c53 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -734,6 +734,7 @@ config ARCH_S5PV310
        select HAVE_CLK
        select GENERIC_CLOCKEVENTS
        select HAVE_S3C_RTC
+       select HAVE_S3C2410_WATCHDOG
        help
          Samsung S5PV310 series based systems
 

diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig
index 4de5d7265a9fce0dc3c7eb69798373af8308d6e3..1d59ce9701c8fc83a2308f34a74c8bd5d815f0ff 100644 (file)
--- a/arch/arm/mach-s5pv310/Kconfig
+++ b/arch/arm/mach-s5pv310/Kconfig
@@ -34,6 +34,7 @@ config MACH_SMDKC210
        select CPU_S5PV310
        select ARCH_SPARSEMEM_ENABLE
        select S3C_DEV_RTC
+       select S3C_DEV_WDT
        help
          Machine support for Samsung SMDKC210
          S5PC210(MCP) is one of package option of S5PV310
@@ -55,6 +56,7 @@ config MACH_SMDKV310
        select CPU_S5PV310
        select ARCH_SPARSEMEM_ENABLE
        select S3C_DEV_RTC
+       select S3C_DEV_WDT
        help
          Machine support for Samsung SMDKV310
 

diff --git a/arch/arm/mach-s5pv310/mach-smdkc210.c b/arch/arm/mach-s5pv310/mach-smdkc210.c
index 9464084cc1f70ad4d7660cb1626a78805c43085c..b0623976b884b65a3d4d98af070976046c1b0ba5 100644 (file)
--- a/arch/arm/mach-s5pv310/mach-smdkc210.c
+++ b/arch/arm/mach-s5pv310/mach-smdkc210.c
@@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdkc210_uartcfgs[] __initdata = {
 
 static struct platform_device *smdkc210_devices[] __initdata = {
        &s3c_device_rtc,
+       &s3c_device_wdt,
 };
 
 static void __init smdkc210_map_io(void)

diff --git a/arch/arm/mach-s5pv310/mach-smdkv310.c b/arch/arm/mach-s5pv310/mach-smdkv310.c
index 06062c8e337c53e9321cd2a2d958d532500fb67f..9cb827da97f573e3c44af48c614d09bba95107e5 100644 (file)
--- a/arch/arm/mach-s5pv310/mach-smdkv310.c
+++ b/arch/arm/mach-s5pv310/mach-smdkv310.c
@@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = {
 
 static struct platform_device *smdkv310_devices[] __initdata = {
        &s3c_device_rtc,
+       &s3c_device_wdt,
 };
 
 static void __init smdkv310_map_io(void)