diff options
| author | Banajit Goswami <banajit.g@samsung.com> | 2010-07-15 11:45:31 +0530 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 18:30:41 +0900 |
| commit | b46de63d69bf2022d358a8139f2590e650badd1e (patch) | |
| tree | ef2e44c0bfb1b259834e3abda51c0f85a77c31b7 | |
| parent | 296b1dac035d4d0daf247a7162f482bbe88fcd0b (diff) | |
| download | linux-b46de63d69bf2022d358a8139f2590e650badd1e.tar.gz linux-b46de63d69bf2022d358a8139f2590e650badd1e.tar.bz2 linux-b46de63d69bf2022d358a8139f2590e650badd1e.zip | |
ARM: S5P6442: Add Watchdog support for S5P6442
This patch adds support for Watchdog timer for Samsung S5P6442.
Signed-off-by: Banajit Goswami <banajit.g@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s5p6442/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/clock.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/mach-smdk6442.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/Kconfig b/arch/arm/mach-s5p6442/Kconfig index 0fd41b447915..7cd28435b50b 100644 --- a/arch/arm/mach-s5p6442/Kconfig +++ b/arch/arm/mach-s5p6442/Kconfig @@ -19,6 +19,8 @@ config CPU_S5P6442 config MACH_SMDK6442 bool "SMDK6442" select CPU_S5P6442 + select S3C_DEV_WDT + select HAVE_S3C2410_WATCHDOG help Machine support for Samsung SMDK6442 diff --git a/arch/arm/mach-s5p6442/clock.c b/arch/arm/mach-s5p6442/clock.c index 087e57f20ad5..dcd20f17212a 100644 --- a/arch/arm/mach-s5p6442/clock.c +++ b/arch/arm/mach-s5p6442/clock.c @@ -361,6 +361,12 @@ static struct clk init_clocks[] = { .enable = s5p6442_clk_ip3_ctrl, .ctrlbit = (1<<19), }, { + .name = "watchdog", + .id = -1, + .parent = &clk_pclkd1, + .enable = s5p6442_clk_ip3_ctrl, + .ctrlbit = (1 << 22), + }, { .name = "timers", .id = -1, .parent = &clk_pclkd1, diff --git a/arch/arm/mach-s5p6442/mach-smdk6442.c b/arch/arm/mach-s5p6442/mach-smdk6442.c index ebcf99777259..6e061bec6b74 100644 --- a/arch/arm/mach-s5p6442/mach-smdk6442.c +++ b/arch/arm/mach-s5p6442/mach-smdk6442.c @@ -66,6 +66,7 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = { static struct platform_device *smdk6442_devices[] __initdata = { &s5p6442_device_iis0, + &s3c_device_wdt, }; static void __init smdk6442_map_io(void) |