aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p6440
diff options
context:
space:
mode:
authorBanajit Goswami <banajit.g@samsung.com>2010-05-20 03:21:31 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-20 06:46:43 -0400
commita0cce45581d1857b057f674ff118197392031559 (patch)
treebbe042e5f76089a79824bacbd20cfd2bf7ab0c42 /arch/arm/mach-s5p6440
parentb351c4a178f538d42b907b90bc6a60bb221fbaae (diff)
ARM: S5P6440: Add Watchdog support for S5P6440
This patch adds support for Watchdog timer for Samsung S5P6440. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5p6440')
-rw-r--r--arch/arm/mach-s5p6440/Kconfig2
-rw-r--r--arch/arm/mach-s5p6440/include/mach/map.h1
-rw-r--r--arch/arm/mach-s5p6440/mach-smdk6440.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig
index 77aeffd17330..d34eda127091 100644
--- a/arch/arm/mach-s5p6440/Kconfig
+++ b/arch/arm/mach-s5p6440/Kconfig
@@ -16,6 +16,8 @@ config CPU_S5P6440
16config MACH_SMDK6440 16config MACH_SMDK6440
17 bool "SMDK6440" 17 bool "SMDK6440"
18 select CPU_S5P6440 18 select CPU_S5P6440
19 select S3C_DEV_WDT
20 select HAVE_S3C2410_WATCHDOG
19 help 21 help
20 Machine support for the Samsung SMDK6440 22 Machine support for the Samsung SMDK6440
21 23
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h
index 72aedadd412c..049f1b93ce2e 100644
--- a/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@ -72,5 +72,6 @@
72/* compatibiltiy defines. */ 72/* compatibiltiy defines. */
73#define S3C_PA_UART S5P6440_PA_UART 73#define S3C_PA_UART S5P6440_PA_UART
74#define S3C_PA_IIC S5P6440_PA_IIC0 74#define S3C_PA_IIC S5P6440_PA_IIC0
75#define S3C_PA_WDT S5P6440_PA_WDT
75 76
76#endif /* __ASM_ARCH_MAP_H */ 77#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c
index d7fede971ca6..af6abc6b749f 100644
--- a/arch/arm/mach-s5p6440/mach-smdk6440.c
+++ b/arch/arm/mach-s5p6440/mach-smdk6440.c
@@ -85,6 +85,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
85 85
86static struct platform_device *smdk6440_devices[] __initdata = { 86static struct platform_device *smdk6440_devices[] __initdata = {
87 &s5p6440_device_iis, 87 &s5p6440_device_iis,
88 &s3c_device_wdt,
88}; 89};
89 90
90static void __init smdk6440_map_io(void) 91static void __init smdk6440_map_io(void)