Skip to content

Commit 7768a13

Browse files
Komal ShahLinus Torvalds
authored andcommitted
[PATCH] OMAP: Add Watchdog driver support
Add Texas Instruments (TI) OMAP1/2 (http://www.ti.com/omap) based processors, like OMAP1610/1710/242x. [[email protected]: cleanups] Cc: <[email protected]> Cc: "Komal Shah" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f1b7c5f commit 7768a13

File tree

4 files changed

+463
-0
lines changed

4 files changed

+463
-0
lines changed

drivers/char/watchdog/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ config EP93XX_WATCHDOG
165165
To compile this driver as a module, choose M here: the
166166
module will be called ep93xx_wdt.
167167

168+
config OMAP_WATCHDOG
169+
tristate "OMAP Watchdog"
170+
depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
171+
help
172+
Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to
173+
enable the OMAP1610/OMAP1710 watchdog timer.
174+
168175
# X86 (i386 + ia64 + x86_64) Architecture
169176

170177
config ACQUIRE_WDT

drivers/char/watchdog/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
2424

2525
# ARM Architecture
2626
obj-$(CONFIG_AT91_WATCHDOG) += at91_wdt.o
27+
obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
2728
obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
2829
obj-$(CONFIG_977_WATCHDOG) += wdt977.o
2930
obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o

0 commit comments

Comments
 (0)