19 files changed, 447 insertions, 396 deletions

diff --git a/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
new file mode 100644
index 000000000000..7c7f6887c796
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
@@ -0,0 +1,13 @@
+* NXP PNX watchdog timer
+
+Required properties:
+- compatible: must be "nxp,pnx4008-wdt"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+Example:
+
+        watchdog@4003C000 {
+                compatible = "nxp,pnx4008-wdt";
+                reg = <0x4003C000 0x1000>;
+        };
diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c
index 63fdc34ceb98..73ff5cc93e05 100644
--- a/Documentation/watchdog/src/watchdog-test.c
+++ b/Documentation/watchdog/src/watchdog-test.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
@@ -29,6 +30,14 @@ static void keep_alive(void)
  * The main program.  Run the program with "-d" to disable the card,
  * or "-e" to enable the card.
  */
+
+void term(int sig)
+{
+    close(fd);
+    fprintf(stderr, "Stopping watchdog ticks...\n");
+    exit(0);
+}
+
 int main(int argc, char *argv[])
 {
     int flags;
@@ -47,26 +56,31 @@ int main(int argc, char *argv[])
             ioctl(fd, WDIOC_SETOPTIONS, &flags);
             fprintf(stderr, "Watchdog card disabled.\n");
             fflush(stderr);
-            exit(0);
+            goto end;
         } else if (!strncasecmp(argv[1], "-e", 2)) {
             flags = WDIOS_ENABLECARD;
             ioctl(fd, WDIOC_SETOPTIONS, &flags);
             fprintf(stderr, "Watchdog card enabled.\n");
             fflush(stderr);
-            exit(0);
+            goto end;
         } else {
             fprintf(stderr, "-d to disable, -e to enable.\n");
             fprintf(stderr, "run by itself to tick the card.\n");
             fflush(stderr);
-            exit(0);
+            goto end;
         }
     } else {
         fprintf(stderr, "Watchdog Ticking Away!\n");
         fflush(stderr);
     }
 
+    signal(SIGINT, term);
+
     while(1) {
         keep_alive();
         sleep(1);
     }
+end:
+    close(fd);
+    return 0;
 }
diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt
index 227f6cd0e5fa..25fe4304f2fc 100644
--- a/Documentation/watchdog/watchdog-kernel-api.txt
+++ b/Documentation/watchdog/watchdog-kernel-api.txt
@@ -59,7 +59,7 @@ It contains following fields:
 * bootstatus: status of the device after booting (reported with watchdog
   WDIOF_* status bits).
 * driver_data: a pointer to the drivers private data of a watchdog device.
-  This data should only be accessed via the watchdog_set_drvadata and
+  This data should only be accessed via the watchdog_set_drvdata and
   watchdog_get_drvdata routines.
 * status: this field contains a number of status bits that give extra
   information about the status of the device (Like: is the watchdog timer
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index edebaf771f50..a18bf6358eb8 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -129,17 +129,6 @@ config 977_WATCHDOG
 
           Not sure? It's safe to say N.
 
-config IXP2000_WATCHDOG
-        tristate "IXP2000 Watchdog"
-        depends on ARCH_IXP2000
-        help
-          Say Y here if to include support for the watchdog timer
-          in the Intel IXP2000(2400, 2800, 2850) network processors.
-          This driver can be built as a module by choosing M. The module
-          will be called ixp2000_wdt.
-
-          Say N if you are unsure.
-
 config IXP4XX_WATCHDOG
         tristate "IXP4xx Watchdog"
         depends on ARCH_IXP4XX
@@ -543,7 +532,7 @@ config WAFER_WDT
 
 config I6300ESB_WDT
         tristate "Intel 6300ESB Timer/Watchdog"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
           Hardware driver for the watchdog timer built into the Intel
           6300ESB controller hub.
@@ -551,6 +540,19 @@ config I6300ESB_WDT
           To compile this driver as a module, choose M here: the
           module will be called i6300esb.
 
+config IE6XX_WDT
+        tristate "Intel Atom E6xx Watchdog"
+        depends on X86 && PCI
+        select WATCHDOG_CORE
+        select MFD_CORE
+        select LPC_SCH
+        ---help---
+          Hardware driver for the watchdog timer built into the Intel
+          Atom E6XX (TunnelCreek) processor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ie6xx_wdt.
+
 config INTEL_SCU_WATCHDOG
         bool "Intel SCU Watchdog for Mobile Platforms"
         depends on X86_MRST
@@ -607,7 +609,12 @@ config IT87_WDT
         depends on X86 && EXPERIMENTAL
         ---help---
           This is the driver for the hardware watchdog on the ITE IT8702,