diff options
author | Banajit Goswami <banajit.g@samsung.com> | 2010-07-15 02:15:31 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 05:30:41 -0400 |
commit | b46de63d69bf2022d358a8139f2590e650badd1e (patch) | |
tree | ef2e44c0bfb1b259834e3abda51c0f85a77c31b7 /arch/arm/mach-s5p6442 | |
parent | 296b1dac035d4d0daf247a7162f482bbe88fcd0b (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s5p6442')
-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 | |||
19 | config MACH_SMDK6442 | 19 | config MACH_SMDK6442 |
20 | bool "SMDK6442" | 20 | bool "SMDK6442" |
21 | select CPU_S5P6442 | 21 | select CPU_S5P6442 |
22 | select S3C_DEV_WDT | ||
23 | select HAVE_S3C2410_WATCHDOG | ||
22 | help | 24 | help |
23 | Machine support for Samsung SMDK6442 | 25 | Machine support for Samsung SMDK6442 |
24 | 26 | ||
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[] = { | |||
361 | .enable = s5p6442_clk_ip3_ctrl, | 361 | .enable = s5p6442_clk_ip3_ctrl, |
362 | .ctrlbit = (1<<19), | 362 | .ctrlbit = (1<<19), |
363 | }, { | 363 | }, { |
364 | .name = "watchdog", | ||
365 | .id = -1, | ||
366 | .parent = &clk_pclkd1, | ||
367 | .enable = s5p6442_clk_ip3_ctrl, | ||
368 | .ctrlbit = (1 << 22), | ||
369 | }, { | ||
364 | .name = "timers", | 370 | .name = "timers", |
365 | .id = -1, | 371 | .id = -1, |
366 | .parent = &clk_pclkd1, | 372 | .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 = { | |||
66 | 66 | ||
67 | static struct platform_device *smdk6442_devices[] __initdata = { | 67 | static struct platform_device *smdk6442_devices[] __initdata = { |
68 | &s5p6442_device_iis0, | 68 | &s5p6442_device_iis0, |
69 | &s3c_device_wdt, | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | static void __init smdk6442_map_io(void) | 72 | static void __init smdk6442_map_io(void) |