diff options
author | Banajit Goswami <banajit.g@samsung.com> | 2010-05-20 03:21:30 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:46:15 -0400 |
commit | b351c4a178f538d42b907b90bc6a60bb221fbaae (patch) | |
tree | 21fcfbbcc834fc4db5136d0165d4bf3f1e5bce6f /arch/arm/mach-s3c64xx | |
parent | e1d5c93e82eadd814949c023d0b16aa8fa8ad7ae (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/map.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 |
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 | |||
92 | select S3C_DEV_FB | 92 | select S3C_DEV_FB |
93 | select S3C_DEV_USB_HOST | 93 | select S3C_DEV_USB_HOST |
94 | select S3C_DEV_USB_HSOTG | 94 | select S3C_DEV_USB_HSOTG |
95 | select S3C_DEV_WDT | ||
96 | select HAVE_S3C2410_WATCHDOG | ||
95 | select S3C64XX_SETUP_SDHCI | 97 | select S3C64XX_SETUP_SDHCI |
96 | select S3C64XX_SETUP_I2C1 | 98 | select S3C64XX_SETUP_I2C1 |
97 | select S3C64XX_SETUP_FB_24BPP | 99 | 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 @@ | |||
104 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG | 104 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG |
105 | #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY | 105 | #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY |
106 | #define S3C_PA_RTC S3C64XX_PA_RTC | 106 | #define S3C_PA_RTC S3C64XX_PA_RTC |
107 | #define S3C_PA_WDT S3C64XX_PA_WATCHDOG | ||
107 | 108 | ||
108 | #define SAMSUNG_PA_ADC S3C64XX_PA_ADC | 109 | #define SAMSUNG_PA_ADC S3C64XX_PA_ADC |
109 | 110 | ||
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 = { | |||
262 | &smdk6410_lcd_powerdev, | 262 | &smdk6410_lcd_powerdev, |
263 | 263 | ||
264 | &smdk6410_smsc911x, | 264 | &smdk6410_smsc911x, |
265 | &s3c_device_wdt, | ||
265 | }; | 266 | }; |
266 | 267 | ||
267 | #ifdef CONFIG_REGULATOR | 268 | #ifdef CONFIG_REGULATOR |