diff options
author | Banajit Goswami <banajit.g@samsung.com> | 2010-05-20 16:21:31 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:46:43 +0900 |
commit | a0cce45581d1857b057f674ff118197392031559 (patch) | |
tree | bbe042e5f76089a79824bacbd20cfd2bf7ab0c42 | |
parent | b351c4a178f538d42b907b90bc6a60bb221fbaae (diff) | |
download | linux-3.10-a0cce45581d1857b057f674ff118197392031559.tar.gz linux-3.10-a0cce45581d1857b057f674ff118197392031559.tar.bz2 linux-3.10-a0cce45581d1857b057f674ff118197392031559.zip |
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>
-rw-r--r-- | arch/arm/mach-s5p6440/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p6440/include/mach/map.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5p6440/mach-smdk6440.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig index 77aeffd1733..d34eda12709 100644 --- a/arch/arm/mach-s5p6440/Kconfig +++ b/arch/arm/mach-s5p6440/Kconfig @@ -16,6 +16,8 @@ config CPU_S5P6440 config MACH_SMDK6440 bool "SMDK6440" select CPU_S5P6440 + select S3C_DEV_WDT + select HAVE_S3C2410_WATCHDOG help Machine support for the Samsung SMDK6440 diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h index 72aedadd412..049f1b93ce2 100644 --- a/arch/arm/mach-s5p6440/include/mach/map.h +++ b/arch/arm/mach-s5p6440/include/mach/map.h @@ -72,5 +72,6 @@ /* compatibiltiy defines. */ #define S3C_PA_UART S5P6440_PA_UART #define S3C_PA_IIC S5P6440_PA_IIC0 +#define S3C_PA_WDT S5P6440_PA_WDT #endif /* __ASM_ARCH_MAP_H */ diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c index d7fede971ca..af6abc6b749 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 = { static struct platform_device *smdk6440_devices[] __initdata = { &s5p6440_device_iis, + &s3c_device_wdt, }; static void __init smdk6440_map_io(void) |