diff options
author | Jemings Ko <jemings@samsung.com> | 2010-09-20 02:33:04 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-20 18:52:18 -0400 |
commit | 8d75c9128a07bd1f81952a518ed818d1a3e90c96 (patch) | |
tree | 698afc1d4db8c70ee533f79233db889077b44b47 /arch/arm/mach-s5pv310 | |
parent | cdff6e6fd2d4360e2d5bc39afe3f1ef17d79dbf0 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s5pv310')
-rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/mach-smdkc210.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/mach-smdkv310.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 4de5d7265a9f..1d59ce9701c8 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig | |||
@@ -34,6 +34,7 @@ config MACH_SMDKC210 | |||
34 | select CPU_S5PV310 | 34 | select CPU_S5PV310 |
35 | select ARCH_SPARSEMEM_ENABLE | 35 | select ARCH_SPARSEMEM_ENABLE |
36 | select S3C_DEV_RTC | 36 | select S3C_DEV_RTC |
37 | select S3C_DEV_WDT | ||
37 | help | 38 | help |
38 | Machine support for Samsung SMDKC210 | 39 | Machine support for Samsung SMDKC210 |
39 | S5PC210(MCP) is one of package option of S5PV310 | 40 | S5PC210(MCP) is one of package option of S5PV310 |
@@ -55,6 +56,7 @@ config MACH_SMDKV310 | |||
55 | select CPU_S5PV310 | 56 | select CPU_S5PV310 |
56 | select ARCH_SPARSEMEM_ENABLE | 57 | select ARCH_SPARSEMEM_ENABLE |
57 | select S3C_DEV_RTC | 58 | select S3C_DEV_RTC |
59 | select S3C_DEV_WDT | ||
58 | help | 60 | help |
59 | Machine support for Samsung SMDKV310 | 61 | Machine support for Samsung SMDKV310 |
60 | 62 | ||
diff --git a/arch/arm/mach-s5pv310/mach-smdkc210.c b/arch/arm/mach-s5pv310/mach-smdkc210.c index 9464084cc1f7..b0623976b884 100644 --- 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 = { | |||
68 | 68 | ||
69 | static struct platform_device *smdkc210_devices[] __initdata = { | 69 | static struct platform_device *smdkc210_devices[] __initdata = { |
70 | &s3c_device_rtc, | 70 | &s3c_device_rtc, |
71 | &s3c_device_wdt, | ||
71 | }; | 72 | }; |
72 | 73 | ||
73 | static void __init smdkc210_map_io(void) | 74 | 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 06062c8e337c..9cb827da97f5 100644 --- 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 = { | |||
68 | 68 | ||
69 | static struct platform_device *smdkv310_devices[] __initdata = { | 69 | static struct platform_device *smdkv310_devices[] __initdata = { |
70 | &s3c_device_rtc, | 70 | &s3c_device_rtc, |
71 | &s3c_device_wdt, | ||
71 | }; | 72 | }; |
72 | 73 | ||
73 | static void __init smdkv310_map_io(void) | 74 | static void __init smdkv310_map_io(void) |