[WATCHDOG] Add support for the WM8350 watchdog

This driver implements support for the watchdog functionality provided
by the Wolfson Microelectronics WM8350, a multi-function audio and
power management subsystem intended for use in embedded systems. It is
based on a driver originally written by Graeme Gregory, though it has
been extensively modified since then.

Use of a GPIO to kick the watchdog is not yet supported.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 81f7021..ec68c74 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -55,6 +55,13 @@ config SOFT_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called softdog.
 
+config WM8350_WATCHDOG
+       tristate "WM8350 watchdog"
+       depends on MFD_WM8350
+       help
+         Support for the watchdog in the WM8350 AudioPlus PMIC.  When
+         the watchdog triggers the system will be reset.
+
 # ALPHA Architecture
 
 # ARM Architecture

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 0cd4786..c19b866 100644 (file)
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -134,4 +134,5 @@ obj-$(CONFIG_WATCHDOG_CP1XXX)               += cpwd.o
 # XTENSA Architecture
 
 # Architecture Independant
+obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o

diff --cc drivers/watchdog/wm8350_wdt.c
Simple merge