diff options
| author | Jemings Ko <jemings@samsung.com> | 2010-09-20 15:33:04 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-21 07:52:18 +0900 |
| commit | 8d75c9128a07bd1f81952a518ed818d1a3e90c96 (patch) | |
| tree | 698afc1d4db8c70ee533f79233db889077b44b47 /arch/arm | |
| parent | cdff6e6fd2d4360e2d5bc39afe3f1ef17d79dbf0 (diff) | |
| download | op-kernel-dev-8d75c9128a07bd1f81952a518ed818d1a3e90c96.zip op-kernel-dev-8d75c9128a07bd1f81952a518ed818d1a3e90c96.tar.gz | |
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')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -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 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 83b4b08..fe3cf37 100644 --- 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 4de5d72..1d59ce9 100644 --- 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 9464084..b062397 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 = { 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 06062c8..9cb827d 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 = { static struct platform_device *smdkv310_devices[] __initdata = { &s3c_device_rtc, + &s3c_device_wdt, }; static void __init smdkv310_map_io(void) |
