Skip to contentSkip to conversation

v2.6.32-rc patches - pull request

WATCHDOG Wim Van Sebroeck 1 participant 1 message Sep 25, 2009 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

 drivers/watchdog/Kconfig   |    7 
 drivers/watchdog/Makefile  |    1 
 drivers/watchdog/adx_wdt.c |  354 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 362 insertions(+)

with these Changes:

Author: Thierry Reding <[email protected]>
Date:   Wed Sep 23 13:49:52 2009 +0200

[WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.

This patch adds support for the watchdog timer on Avionic Design Xanthos boards.

The Changes can also be looked at on:

	http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================

drivers/watchdog/Kconfig +7 -0
index ff3eb8f..3711b88 100644
@@ -282,6 +282,13 @@ config NUC900_WATCHDOG
 	  To compile this driver as a module, choose M here: the
 	  module will be called nuc900_wdt.
 
+config ADX_WATCHDOG
+	tristate "Avionic Design Xanthos watchdog"
+	depends on ARCH_PXA_ADX
+	help
+	  Say Y here if you want support for the watchdog timer on Avionic
+	  Design Xanthos boards.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
drivers/watchdog/Makefile +1 -0
index 348b3b8..699199b 100644
@@ -45,6 +45,7 @@ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
 obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
 obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
 obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
+obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
drivers/watchdog/adx_wdt.c new file +354 -0

354 lines not on this page · raw message