summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBanajit Goswami <banajit.g@samsung.com>2010-05-20 16:21:30 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 19:46:15 +0900
commitb351c4a178f538d42b907b90bc6a60bb221fbaae (patch)
tree21fcfbbcc834fc4db5136d0165d4bf3f1e5bce6f
parente1d5c93e82eadd814949c023d0b16aa8fa8ad7ae (diff)
downloadtalos-op-linux-b351c4a178f538d42b907b90bc6a60bb221fbaae.tar.gz
talos-op-linux-b351c4a178f538d42b907b90bc6a60bb221fbaae.zip
ARM: SMDK6410: Add Watchdog support for SMDK6410
This patch adds support for Watchdog timer for Samsung S3C6410 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-s3c64xx/Kconfig2
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/map.h1
-rw-r--r--arch/arm/mach-s3c64xx/mach-smdk6410.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 69e9fbfea917..d0c5743e32ee 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -92,6 +92,8 @@ config MACH_SMDK6410
select S3C_DEV_FB
select S3C_DEV_USB_HOST
select S3C_DEV_USB_HSOTG
+ select S3C_DEV_WDT
+ select HAVE_S3C2410_WATCHDOG
select S3C64XX_SETUP_SDHCI
select S3C64XX_SETUP_I2C1
select S3C64XX_SETUP_FB_24BPP
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 9fdd50c8c767..c3e48cdfb990 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -104,6 +104,7 @@
#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG
#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY
#define S3C_PA_RTC S3C64XX_PA_RTC
+#define S3C_PA_WDT S3C64XX_PA_WATCHDOG
#define SAMSUNG_PA_ADC S3C64XX_PA_ADC
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 9d51455feb31..c299455e5f57 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -262,6 +262,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
&smdk6410_lcd_powerdev,
&smdk6410_smsc911x,
+ &s3c_device_wdt,
};
#ifdef CONFIG_REGULATOR
OpenPOWER on IntegriCloud