54 files changed, 4365 insertions, 139 deletions

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index fff89c2d88fd..ea09d0c974ea 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -13,7 +13,7 @@ config WATCHDOG
           subsequently opening the file and then failing to write to it for
           longer than 1 minute will result in rebooting the machine. This
           could be useful for a networked machine that needs to come back
-          online as fast as possible after a lock-up. There's both a watchdog
+          on-line as fast as possible after a lock-up. There's both a watchdog
           implementation entirely in software (which can sometimes fail to
           reboot the machine) and a driver for hardware watchdog boards, which
           are more robust and can also keep track of the temperature inside
@@ -60,7 +60,7 @@ config SOFT_WATCHDOG
 
 # ARM Architecture
 
-config AT91_WATCHDOG
+config AT91RM9200_WATCHDOG
         tristate "AT91RM9200 watchdog"
         depends on WATCHDOG && ARCH_AT91RM9200
         help
@@ -71,7 +71,7 @@ config 21285_WATCHDOG
         tristate "DC21285 watchdog"
         depends on WATCHDOG && FOOTBRIDGE
         help
-          The Intel Footbridge chip contains a builtin watchdog circuit. Say Y
+          The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
           here if you wish to use this. Alternatively say M to compile the
           driver as a module, which will be called wdt285.
 
@@ -165,6 +165,24 @@ config EP93XX_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called ep93xx_wdt.
 
+config OMAP_WATCHDOG
+        tristate "OMAP Watchdog"
+        depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
+        help
+          Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
+          enable the OMAP1610/OMAP1710 watchdog timer.
+
+config PNX4008_WATCHDOG
+        tristate "PNX4008 Watchdog"
+        depends on WATCHDOG && ARCH_PNX4008
+        help
+          Say Y here if to include support for the watchdog timer
+          in the PNX4008 processor.
+          This driver can be built as a module by choosing M. The module
+          will be called pnx4008_wdt.
+
+          Say N if you are unsure.
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
@@ -251,11 +269,11 @@ config IB700_WDT
           Most people will say N.
 
 config IBMASR
-        tristate "IBM Automatic Server Restart"
-        depends on WATCHDOG && X86
-        help
+        tristate "IBM Automatic Server Restart"
+        depends on WATCHDOG && X86
+        help
           This is the driver for the IBM Automatic Server Restart watchdog
-          timer builtin into some eServer xSeries machines.
+          timer built-in into some eServer xSeries machines.
 
           To compile this driver as a module, choose M here: the
           module will be called ibmasr.
@@ -298,6 +316,38 @@ config I8XX_TCO
           To compile this driver as a module, choose M here: the
           module will be called i8xx_tco.
 
+          Note: This driver will be removed in the near future. Please
+          use the Intel TCO Timer/Watchdog driver.
+
+config ITCO_WDT
+        tristate "Intel TCO Timer/Watchdog"
+        depends on WATCHDOG && (X86 || IA64) && PCI
+        ---help---
+          Hardware driver for the intel TCO timer based watchdog devices.
+          These drivers are included in the Intel 82801 I/O Controller
+          Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
+          controller hub.
+
+          The TCO (Total Cost of Ownership) timer is a watchdog timer
+          that will reboot the machine after its second expiration. The
+          expiration time can be configured with the "heartbeat" parameter.
+
+          On some motherboards the driver may fail to reset the chipset's
+          NO_REBOOT flag which prevents the watchdog from rebooting the
+          machine. If this is the case you will get a kernel message like
+          "failed to reset NO_REBOOT flag, reboot disabled by hardware".
+
+          To compile this driver as a module, choose M here: the
+          module will be called iTCO_wdt.
+
+config ITCO_VENDOR_SUPPORT
+        bool "Intel TCO Timer/Watchdog Specific Vendor Support"
+        depends on ITCO_WDT
+        ---help---
+          Add vendor specific support to the intel TCO timer based watchdog
+          devices. At this moment we only have additional support for some
+          SuperMicro Inc. motherboards.
+
 config SC1200_WDT
         tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
         depends on WATCHDOG && X86
@@ -321,6 +371,20 @@ config SCx200_WDT
 
           If compiled as a module, it will be called scx200_wdt.
 
+config PC87413_WDT
+        tristate "NS PC87413 watchdog"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the hardware watchdog on the PC87413 chipset
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pc87413_wdt.
+
+          Most people will say N.
+ 
 config 60XX_WDT
         tristate "SBC-60XX Watchdog Timer"
         depends on WATCHDOG && X86
@@ -356,6 +420,26 @@ config CPU5_WDT
           To compile this driver as a module, choose M here: the
           module will be called cpu5wdt.
 
+config SMSC37B787_WDT
+        tristate "Winbond SMsC37B787 Watchdog Timer"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the hardware watchdog component on the
+          Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
+          from Vision Systems and maybe others.
+
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
+
+          Usually a userspace daemon will notify the kernel WDT driver that
+          userspace is still alive, at regular intervals.
+
+          To compile this driver as a module, choose M here: the
+          module will be called smsc37b787_wdt.
+
+          Most people will say N.
+
 config W83627HF_WDT
         tristate "W83627HF Watchdog Timer"
         depends on WATCHDOG && X86
@@ -371,6 +455,21 @@ config W83627HF_WDT
 
           Most people will say N.
 
+config W83697HF_WDT
+        tristate "W83697HF/W83697HG Watchdog Timer"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the hardware watchdog on the W83697HF/HG
+          chipset as used in Dedibox/VIA motherboards (and likely others).
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
+
+          To compile this driver as a module, choose M here: the
+          module will be called w83697hf_wdt.
+
+          Most people will say N.
+
 config W83877F_WDT
         tristate "W83877F (EMACS) Watchdog Timer"
         depends on WATCHDOG && X86
@@ -404,7 +503,7 @@ config MACHZ_WDT
         depends on WATCHDOG && X86
         ---help---
           If you are using a ZF Micro MachZ processor, say Y here, otherwise
-          N.  This is the driver for the watchdog timer builtin on that
+          N.  This is the driver for the watchdog timer built-in on that
           processor using ZF-Logic interface.  This watchdog simply watches
           your kernel to make sure it doesn't freeze, and if it does, it
           reboots your computer after a certain amount of time.
@@ -433,7 +532,6 @@ config SBC_EPX_C3_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called sbc_epx_c3.
 
-
 # PowerPC Architecture
 
 config 8xx_WDT
@@ -463,7 +561,7 @@ config WATCHDOG_RTAS
         help
           This driver adds watchdog support for the RTAS watchdog.
 
-          To compile this driver as a module, choose M here. The module
+          To compile this driver as a module, choose M here. The module
           will be called wdrtas.
 
 # MIPS Architecture
@@ -477,6 +575,16 @@ config INDYDOG
           timer expired and no process has written to /dev/watchdog during
           that time.
 
+config WDT_RM9K_GPI
+        tristate "RM9000/GPI hardware watchdog"
+        depends on WATCHDOG && CPU_RM9000
+        help
+          Watchdog implementation using the GPI hardware found on
+          PMC-Sierra RM9xxx CPUs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rm9k_wdt.
+
 # S390 Architecture
 
 config ZVM_WATCHDOG
@@ -510,6 +618,14 @@ config SH_WDT
           To compile this driver as a module, choose M here: the
           module will be called shwdt.
 
+config SH_WDT_MMAP
+        bool "Allow mmap of SH WDT"
+        default n
+        depends on SH_WDT
+        help
+          If you say Y here, user applications will be able to mmap the
+          WDT/CPG registers.
+
 # SPARC64 Architecture
 
 config WATCHDOG_CP1XXX
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 6ab77b61a643..2cd8ff8d10ac 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -23,7 +23,8 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o
 obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
 
 # ARM Architecture
-obj-$(CONFIG_AT91_WATCHDOG) += at91_wdt.o
+obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
+obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
 obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
 obj-$(CONFIG_977_WATCHDOG) += wdt977.o
 obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
@@ -32,6 +33,7 @@ obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
 obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
+obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
 
 # X86 (i386 + ia64 + x86_64) Architecture
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
@@ -45,12 +47,16 @@ obj-$(CONFIG_IBMASR) += ibmasr.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
 obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
 obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
+obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
 obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
 obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
+obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
 obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
+obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o
 obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
 obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
@@ -67,6 +73,7 @@ obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 
 # MIPS Architecture
 obj-$(CONFIG_INDYDOG) += indydog.o
+obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
 
 # S390 Architecture
 
diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/char/watchdog/acquirewdt.c
index c77fe3cf2852..154d67e591e5 100644
--- a/drivers/char/watchdog/acquirewdt.c
+++ b/drivers/char/watchdog/acquirewdt.c
@@ -183,7 +183,7 @@ static int acq_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/advantechwdt.c b/drivers/char/watchdog/advantechwdt.c
index 8069be445edc..9d732769ba01 100644
--- a/drivers/char/watchdog/advantechwdt.c
+++ b/drivers/char/watchdog/advantechwdt.c
@@ -176,7 +176,7 @@ advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c
index c5c94e4c9495..01b0d132ee41 100644
--- a/drivers/char/watchdog/alim1535_wdt.c
+++ b/drivers/char/watchdog/alim1535_wdt.c
@@ -236,7 +236,7 @@ static int ali_ioctl(struct inode *inode, struct file *file,
                         return put_user(timeout, p);
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -330,17 +330,20 @@ static int __init ali_find_watchdog(void)
         u32 wdog;
 
         /* Check for a 1535 series bridge */
-        pdev = pci_find_device(PCI_VENDOR_ID_AL, 0x1535, NULL);
+        pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL);
         if(pdev == NULL)
                 return -ENODEV;
+        pci_dev_put(pdev);
 
         /* Check for the a 7101 PMU */
-        pdev = pci_find_device(PCI_VENDOR_ID_AL, 0x7101, NULL);
+        pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x7101, NULL);
         if(pdev == NULL)
                 return -ENODEV;
 
-        if(pci_enable_device(pdev))
+        if(pci_enable_device(pdev)) {
+                pci_dev_put(pdev);
                 return -EIO;
+        }
 
         ali_pci = pdev;
 
@@ -447,6 +450,7 @@ static void __exit watchdog_exit(void)
         /* Deregister */
         unregister_reboot_notifier(&ali_notifier);
         misc_deregister(&ali_miscdev);
+        pci_dev_put(ali_pci);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index ffd7684f999b..bf25d0a55a99 100644
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -77,7 +77,8 @@ static struct pci_dev *alim7101_pmu;
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+                 __stringify(CONFIG_WATCHDOG_NOWAYOUT) ")");
 
 /*
  *      Whack the dog
@@ -277,7 +278,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                 case WDIOC_GETTIMEOUT:
                         return put_user(timeout, p);
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -333,6 +334,7 @@ static void __exit alim7101_wdt_unload(void)
         /* Deregister */
         misc_deregister(&wdt_miscdev);
         unregister_reboot_notifier(&wdt_notifier);
+        pci_dev_put(alim7101_pmu);
 }
 
 static int __init alim7101_wdt_init(void)
@@ -342,7 +344,8 @@ static int __init alim7101_wdt_init(void)
         char tmp;
 
         printk(KERN_INFO PFX "Steve Hill <steve@navaho.co.uk>.\n");
-        alim7101_pmu = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,NULL);
+        alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
+                NULL);
         if (!alim7101_pmu) {
                 printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n");
                 return -EBUSY;
@@ -351,21 +354,23 @@ static int __init alim7101_wdt_init(void)
         /* Set the WDT in the PMU to 1 second */
         pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, 0x02);
 
-        ali1543_south = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
+        ali1543_south = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+                NULL);
         if (!ali1543_south) {
                 printk(KERN_INFO PFX "ALi 1543 South-Bridge not present - WDT not set\n");
-                return -EBUSY;
+                goto err_out;
         }
         pci_read_config_byte(ali1543_south, 0x5e, &tmp);
+        pci_dev_put(ali1543_south);
         if ((tmp & 0x1e) == 0x00) {
                 if (!use_gpio) {
                         printk(KERN_INFO PFX "Detected old alim7101 revision 'a1d'.  If this is a cobalt board, set the 'use_gpio' module parameter.\n");
-                        return -EBUSY;
+                        goto err_out;
                 } 
                 nowayout = 1;
         } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) {
                 printk(KERN_INFO PFX "ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n");
-                return -EBUSY;
+                goto err_out;
         }
 
         if(timeout < 1 || timeout > 3600) /* arbitrary upper limit */
@@ -404,12 +409,23 @@ static int __init alim7101_wdt_init(void)
 err_out_miscdev:
         misc_deregister(&wdt_miscdev);
 err_out:
+        pci_dev_put(alim7101_pmu);
         return rc;
 }
 
 module_init(alim7101_wdt_init);
 module_exit(alim7101_wdt_unload);
 
+static struct pci_device_id alim7101_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl);
+
 MODULE_AUTHOR("Steve Hill");
 MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/watchdog/at91_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index cc266715ea32..cb86967e2c5f 100644
--- a/drivers/char/watchdog/at91_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@ -21,6 +21,7 @@
 #include <linux/watchdog.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
+#include <asm/arch/at91_st.h>
 
 
 #define WDT_DEFAULT_TIME        5       /* seconds */
@@ -168,7 +169,7 @@ static int at91_wdt_ioctl(struct inode *inode, struct file *file,
                         return 0;
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index e3cefc538b40..488902231cc2 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -125,7 +125,7 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file,
                         return -EINVAL;
                 return 0;
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index 04c7e49918db..00bdabb90f27 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -183,7 +183,7 @@ static int cpu5wdt_ioctl(struct inode *inode, struct file *file, unsigned int cm
                         }
                         break;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/ep93xx_wdt.c b/drivers/char/watchdog/ep93xx_wdt.c
index 77c8a955ae9e..01cf123b1616 100644
--- a/drivers/char/watchdog/ep93xx_wdt.c
+++ b/drivers/char/watchdog/ep93xx_wdt.c
@@ -144,7 +144,7 @@ static int
 ep93xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                  unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index 62dbccb2f6df..e228d6e173ce 100644
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -153,7 +153,7 @@ static void eurwdt_activate_timer(void)
  * Kernel methods.
  */
 
-static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t eurwdt_interrupt(int irq, void *dev_id)
 {
         printk(KERN_CRIT "timeout WDT timeout\n");
 
@@ -240,7 +240,7 @@ static int eurwdt_ioctl(struct inode *inode, struct file *file,
 
         switch(cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
index 870539eabbf3..fb64df4d7c87 100644
--- a/drivers/char/watchdog/i6300esb.c
+++ b/drivers/char/watchdog/i6300esb.c
@@ -315,7 +315,7 @@ static int esb_ioctl (struct inode *inode, struct file *file,
                         return put_user(heartbeat, p);
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
index 8385dd36eefe..e0627d79707b 100644
--- a/drivers/char/watchdog/i8xx_tco.c
+++ b/drivers/char/watchdog/i8xx_tco.c
@@ -356,7 +356,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -406,18 +406,18 @@ static struct notifier_block i8xx_tco_notifier = {
  * want to register another driver on the same PCI id.
  */
 static struct pci_device_id i8xx_tco_pci_tbl[] = {
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,    PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,       PCI_ANY_ID, PCI_ANY_ID, },
-        { 0, },                 /* End of list */
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1) },
+        { },                    /* End of list */
 };
 MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
 
@@ -434,12 +434,11 @@ static unsigned char __init i8xx_tco_getdevice (void)
          *      Find the PCI device
          */
 
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        for_each_pci_dev(dev)
                 if (pci_match_id(i8xx_tco_pci_tbl, dev)) {
                         i8xx_tco_pci = dev;
                         break;
                 }
-        }
 
         if (i8xx_tco_pci) {
                 /*
@@ -454,6 +453,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                 /* Something's wrong here, ACPIBASE has to be set */
                 if (badr == 0x0001 || badr == 0x0000) {
                         printk (KERN_ERR PFX "failed to get TCOBASE address\n");
+                        pci_dev_put(i8xx_tco_pci);
                         return 0;
                 }
 
@@ -465,6 +465,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                         pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);
                         if (val1 & 0x02) {
                                 printk (KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
+                                pci_dev_put(i8xx_tco_pci);
                                 return 0;       /* Cannot reset NO_REBOOT bit */
                         }
                 }
@@ -476,6 +477,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                 if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {
                         printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
                                 SMI_EN + 1);
+                        pci_dev_put(i8xx_tco_pci);
                         return 0;
                 }
                 val1 = inb (SMI_EN + 1);
@@ -542,6 +544,7 @@ unreg_notifier:
 unreg_region:
         release_region (TCOBASE, 0x10);
 out:
+        pci_dev_put(i8xx_tco_pci);
         return ret;
 }
 
@@ -555,6 +558,8 @@ static void __exit watchdog_cleanup (void)
         misc_deregister (&i8xx_tco_miscdev);
         unregister_reboot_notifier(&i8xx_tco_notifier);
         release_region (TCOBASE, 0x10);
+
+        pci_dev_put(i8xx_tco_pci);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/char/watchdog/iTCO_vendor_support.c b/drivers/char/watchdog/iTCO_vendor_support.c
new file mode 100644
index 000000000000..415083990097
--- /dev/null
+++ b/drivers/char/watchdog/iTCO_vendor_support.c
@@ -0,0 +1,307 @@
+/*
+ *      intel TCO vendor specific watchdog driver support
+ *
+ *      (c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>.
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor
+ *      provide warranty for any of this software. This material is
+ *      provided "AS-IS" and at no charge.
+ */
+
+/*
+ *      Includes, defines, variables, module parameters, ...
+ */
+
+/* Module and version information */
+#define DRV_NAME        "iTCO_vendor_support"
+#define DRV_VERSION     "1.01"
+#define DRV_RELDATE     "11-Nov-2006"
+#define PFX             DRV_NAME ": "
+
+/* Includes */
+#include <linux/module.h>               /* For module specific items */
+#include <linux/moduleparam.h>          /* For new moduleparam's */
+#include <linux/types.h>                /* For standard types (like size_t) */
+#include <linux/errno.h>                /* For the -ENODEV/... values */
+#include <linux/kernel.h>               /* For printk/panic/... */
+#include <linux/init.h>                 /* For __init/__exit/... */
+#include <linux/ioport.h>               /* For io-port access */
+
+#include <asm/io.h>                     /* For inb/outb/... */
+
+/* iTCO defines */
+#define SMI_EN          acpibase + 0x30 /* SMI Control and Enable Register */
+#define TCOBASE         acpibase + 0x60 /* TCO base address             */
+#define TCO1_STS        TCOBASE + 0x04  /* TCO1 Status Register         */
+
+/* List of vendor support modes */
+#define SUPERMICRO_OLD_BOARD    1       /* SuperMicro Pentium 3 Era 370SSE+-OEM1/P3TSSE */
+#define SUPERMICRO_NEW_BOARD    2       /* SuperMicro Pentium 4 / Xeon 4 / EMT64T Era Systems */
+
+static int vendorsupport = 0;
+module_param(vendorsupport, int, 0);
+MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (none), 1=SuperMicro Pent3, 2=SuperMicro Pent4+");
+
+/*
+ *      Vendor Specific Support
+ */
+
+/*
+ *      Vendor Support: 1
+ *      Board: Super Micro Computer Inc. 370SSE+-OEM1/P3TSSE
+ *      iTCO chipset: ICH2
+ *
+ *      Code contributed by: R. Seretny <lkpatches@paypc.com>
+ *      Documentation obtained by R. Seretny from SuperMicro Technical Support
+ *
+ *      To enable Watchdog function:
+ *          BIOS setup -> Power -> TCO Logic SMI Enable -> Within5Minutes
+ *          This setting enables SMI to clear the watchdog expired flag.
+ *          If BIOS or CPU fail which may cause SMI hang, then system will
+ *          reboot. When application starts to use watchdog function,
+ *          application has to take over the control from SMI.
+ *
+ *          For P3TSSE, J36 jumper needs to be removed to enable the Watchdog
+ *          function.
+ *
+ *          Note: The system will reboot when Expire Flag is set TWICE.
+ *          So, if the watchdog timer is 20 seconds, then the maximum hang
+ *          time is about 40 seconds, and the minimum hang time is about
+ *          20.6 seconds.
+ */
+
+static void supermicro_old_pre_start(unsigned long acpibase)
+{
+        unsigned long val32;
+
+        val32 = inl(SMI_EN);
+        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+        outl(val32, SMI_EN);    /* Needed to activate watchdog */
+}
+
+static void supermicro_old_pre_stop(unsigned long acpibase)
+{
+        unsigned long val32;
+
+        val32 = inl(SMI_EN);
+        val32 &= 0x00002000;    /* Turn on SMI clearing watchdog */
+        outl(val32, SMI_EN);    /* Needed to deactivate watchdog */
+}
+
+static void supermicro_old_pre_keepalive(unsigned long acpibase)
+{
+        /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */
+        /* Clear "Expire Flag" (Bit 3 of TC01_STS register) */
+        outb(0x08, TCO1_STS);
+}
+
+/*
+ *      Vendor Support: 2
+ *      Board: Super Micro Computer Inc. P4SBx, P4DPx
+ *      iTCO chipset: ICH4
+ *
+ *      Code contributed by: R. Seretny <lkpatches@paypc.com>
+ *      Documentation obtained by R. Seretny from SuperMicro Technical Support
+ *
+ *      To enable Watchdog function:
+ *       1. BIOS
+ *        For P4SBx:
+ *        BIOS setup -> Advanced -> Integrated Peripherals -> Watch Dog Feature
+ *        For P4DPx:
+ *        BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog
+ *       This setting enables or disables Watchdog function. When enabled, the
+ *       default watchdog timer is set to be 5 minutes (about 4’35�). It is
+ *       enough to load and run the OS. The application (service or driver) has
+ *       to take over the control once OS is running up and before watchdog
+ *       expires.
+ *
+ *       2. JUMPER
+ *        For P4SBx: JP39
+ *        For P4DPx: JP37
+ *        This jumper is used for safety.  Closed is enabled. This jumper
+ *        prevents user enables watchdog in BIOS by accident.
+ *
+ *       To enable Watch Dog function, both BIOS and JUMPER must be enabled.
+ *
+ *      The documentation lists motherboards P4SBx and P4DPx series as of
+ *      20-March-2002. However, this code works flawlessly with much newer
+ *      motherboards, such as my X6DHR-8G2 (SuperServer 6014H-82).
+ *
+ *      The original iTCO driver as written does not actually reset the
+ *      watchdog timer on these machines, as a result they reboot after five
+ *      minutes.
+ *
+ *      NOTE: You may leave the Watchdog function disabled in the SuperMicro
+ *      BIOS to avoid a "boot-race"... This driver will enable watchdog
+ *      functionality even if it's disabled in the BIOS once the /dev/watchdog
+ *      file is opened.
+ */
+
+/* I/O Port's */
+#define SM_REGINDEX     0x2e            /* SuperMicro ICH4+ Register Index */
+#define SM_DATAIO       0x2f            /* SuperMicro ICH4+ Register Data I/O */
+
+/* Control Register's */
+#define SM_CTLPAGESW    0x07            /* SuperMicro ICH4+ Control Page Switch */
+#define SM_CTLPAGE              0x08    /* SuperMicro ICH4+ Control Page Num */
+
+#define SM_WATCHENABLE  0x30            /* Watchdog enable: Bit 0: 0=off, 1=on */
+
+#define SM_WATCHPAGE    0x87            /* Watchdog unlock control page */
+
+#define SM_ENDWATCH     0xAA            /* Watchdog lock control page */
+
+#define SM_COUNTMODE    0xf5            /* Watchdog count mode select */
+                                        /* (Bit 3: 0 = seconds, 1 = minutes */
+
+#define SM_WATCHTIMER   0xf6            /* 8-bits, Watchdog timer counter (RW) */
+
+#define SM_RESETCONTROL 0xf7            /* Watchdog reset control */
+                                        /* Bit 6: timer is reset by kbd interrupt */
+                                        /* Bit 7: timer is reset by mouse interrupt */
+
+static void supermicro_new_unlock_watchdog(void)
+{
+        outb(SM_WATCHPAGE, SM_REGINDEX);        /* Write 0x87 to port 0x2e twice */
+        outb(SM_WATCHPAGE, SM_REGINDEX);
+
+        outb(SM_CTLPAGESW, SM_REGINDEX);        /* Switch to watchdog control page */
+        outb(SM_CTLPAGE, SM_DATAIO);
+}
+
+static void supermicro_new_lock_watchdog(void)
+{
+        outb(SM_ENDWATCH, SM_REGINDEX);
+}
+
+static void supermicro_new_pre_start(unsigned int heartbeat)
+{
+        unsigned int val;
+
+        supermicro_new_unlock_watchdog();
+
+        /* Watchdog timer setting needs to be in seconds*/
+        outb(SM_COUNTMODE, SM_REGINDEX);
+        val = inb(SM_DATAIO);
+        val &= 0xF7;
+        outb(val, SM_DATAIO);
+
+        /* Write heartbeat interval to WDOG */
+        outb (SM_WATCHTIMER, SM_REGINDEX);
+        outb((heartbeat & 255), SM_DATAIO);
+
+        /* Make sure keyboard/mouse interrupts don't interfere */
+        outb(SM_RESETCONTROL, SM_REGINDEX);
+        val = inb(SM_DATAIO);
+        val &= 0x3f;
+        outb(val, SM_DATAIO);
+
+        /* enable watchdog by setting bit 0 of Watchdog Enable to 1 */
+        outb(SM_WATCHENABLE, SM_REGINDEX);
+        val = inb(SM_DATAIO);
+        val |= 0x01;
+        outb(val, SM_DATAIO);
+
+        supermicro_new_lock_watchdog();
+}
+
+static void supermicro_new_pre_stop(void)
+{
+        unsigned int val;
+
+        supermicro_new_unlock_watchdog();
+
+        /* disable watchdog by setting bit 0 of Watchdog Enable to 0 */
+        outb(SM_WATCHENABLE, SM_REGINDEX);
+        val = inb(SM_DATAIO);
+        val &= 0xFE;
+        outb(val, SM_DATAIO);
+
+        supermicro_new_lock_watchdog();
+}
+
+static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat)
+{
+        supermicro_new_unlock_watchdog();
+
+        /* reset watchdog timeout to heartveat value */
+        outb(SM_WATCHTIMER, SM_REGINDEX);
+        outb((heartbeat & 255), SM_DATAIO);
+
+        supermicro_new_lock_watchdog();
+}
+
+/*
+ *      Generic Support Functions
+ */
+
+void iTCO_vendor_pre_start(unsigned long acpibase,
+                           unsigned int heartbeat)
+{
+        if (vendorsupport == SUPERMICRO_OLD_BOARD)
+                supermicro_old_pre_start(acpibase);
+        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+                supermicro_new_pre_start(heartbeat);
+}
+EXPORT_SYMBOL(iTCO_vendor_pre_start);
+
+void iTCO_vendor_pre_stop(unsigned long acpibase)
+{
+        if (vendorsupport == SUPERMICRO_OLD_BOARD)
+                supermicro_old_pre_stop(acpibase);
+        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+                supermicro_new_pre_stop();
+}
+EXPORT_SYMBOL(iTCO_vendor_pre_stop);
+
+void iTCO_vendor_pre_keepalive(unsigned long acpibase, unsigned int heartbeat)
+{
+        if (vendorsupport == SUPERMICRO_OLD_BOARD)
+                supermicro_old_pre_keepalive(acpibase);
+        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+                supermicro_new_pre_set_heartbeat(heartbeat);
+}
+EXPORT_SYMBOL(iTCO_vendor_pre_keepalive);
+
+void iTCO_vendor_pre_set_heartbeat(unsigned int heartbeat)
+{
+        if (vendorsupport == SUPERMICRO_NEW_BOARD)
+                supermicro_new_pre_set_heartbeat(heartbeat);
+}
+EXPORT_SYMBOL(iTCO_vendor_pre_set_heartbeat);
+
+int iTCO_vendor_check_noreboot_on(void)
+{
+        switch(vendorsupport) {
+        case SUPERMICRO_OLD_BOARD:
+                return 0;
+        default:
+                return 1;
+        }
+}
+EXPORT_SYMBOL(iTCO_vendor_check_noreboot_on);
+
+static int __init iTCO_vendor_init_module(void)
+{
+        printk (KERN_INFO PFX "vendor-support=%d\n", vendorsupport);
+        return 0;
+}
+
+static void __exit iTCO_vendor_exit_module(void)
+{
+        printk (KERN_INFO PFX "Module Unloaded\n");
+}
+
+module_init(iTCO_vendor_init_module);
+module_exit(iTCO_vendor_exit_module);
+
+MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>, R. Seretny <lkpatches@paypc.com>");
+MODULE_DESCRIPTION("Intel TCO Vendor Specific WatchDog Timer Driver Support");
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c
new file mode 100644
index 000000000000..7eac922df867
--- /dev/null
+++ b/drivers/char/watchdog/iTCO_wdt.c
@@ -0,0 +1,772 @@
+/*
+ *      intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets)
+ *
+ *      (c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>.
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor
+ *      provide warranty for any of this software. This material is
+ *      provided "AS-IS" and at no charge.
+ *
+ *      The TCO watchdog is implemented in the following I/O controller hubs:
+ *      (See the intel documentation on http://developer.intel.com.)
+ *      82801AA  (ICH)       : document number 290655-003, 290677-014,
+ *      82801AB  (ICHO)      : document number 290655-003, 290677-014,
+ *      82801BA  (ICH2)      : document number 290687-002, 298242-027,
+ *      82801BAM (ICH2-M)    : document number 290687-002, 298242-027,
+ *      82801CA  (ICH3-S)    : document number 290733-003, 290739-013,
+ *      82801CAM (ICH3-M)    : document number 290716-001, 290718-007,
+ *      82801DB  (ICH4)      : document number 290744-001, 290745-020,
+ *      82801DBM (ICH4-M)    : document number 252337-001, 252663-005,
+ *      82801E   (C-ICH)     : document number 273599-001, 273645-002,
+ *      82801EB  (ICH5)      : document number 252516-001, 252517-003,
+ *      82801ER  (ICH5R)     : document number 252516-001, 252517-003,
+ *      82801FB  (ICH6)      : document number 301473-002, 301474-007,
+ *      82801FR  (ICH6R)     : document number 301473-002, 301474-007,
+ *      82801FBM (ICH6-M)    : document number 301473-002, 301474-007,
+ *      82801FW  (ICH6W)     : document number 301473-001, 301474-007,
+ *      82801FRW (ICH6RW)    : document number 301473-001, 301474-007,
+ *      82801GB  (ICH7)      : document number 307013-002, 307014-009,
+ *      82801GR  (ICH7R)     : document number 307013-002, 307014-009,
+ *      82801GDH (ICH7DH)    : document number 307013-002, 307014-009,
+ *      82801GBM (ICH7-M)    : document number 307013-002, 307014-009,
+ *      82801GHM (ICH7-M DH) : document number 307013-002, 307014-009,
+ *      82801HB  (ICH8)      : document number 313056-002, 313057-004,
+ *      82801HR  (ICH8R)     : document number 313056-002, 313057-004,
+ *      82801HH  (ICH8DH)    : document number 313056-002, 313057-004,
+ *      82801HO  (ICH8DO)    : document number 313056-002, 313057-004,
+ *      6300ESB  (6300ESB)   : document number 300641-003
+ */
+
+/*
+ *      Includes, defines, variables, module parameters, ...
+ */
+
+/* Module and version information */
+#define DRV_NAME        "iTCO_wdt"
+#define DRV_VERSION     "1.01"
+#define DRV_RELDATE     "11-Nov-2006"
+#define PFX             DRV_NAME ": "
+
+/* Includes */
+#include <linux/module.h>               /* For module specific items */
+#include <linux/moduleparam.h>          /* For new moduleparam's */
+#include <linux/types.h>                /* For standard types (like size_t) */
+#include <linux/errno.h>                /* For the -ENODEV/... values */
+#include <linux/kernel.h>               /* For printk/panic/... */
+#include <linux/miscdevice.h>           /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
+#include <linux/watchdog.h>             /* For the watchdog specific items */
+#include <linux/init.h>                 /* For __init/__exit/... */
+#include <linux/fs.h>                   /* For file operations */
+#include <linux/platform_device.h>      /* For platform_driver framework */
+#include <linux/pci.h>                  /* For pci functions */
+#include <linux/ioport.h>               /* For io-port access */
+#include <linux/spinlock.h>             /* For spin_lock/spin_unlock/... */
+
+#include <asm/uaccess.h>                /* For copy_to_user/put_user/... */
+#include <asm/io.h>                     /* For inb/outb/... */
+
+/* TCO related info */
+enum iTCO_chipsets {
+        TCO_ICH = 0,    /* ICH */
+        TCO_ICH0,       /* ICH0 */
+        TCO_ICH2,       /* ICH2 */
+        TCO_ICH2M,      /* ICH2-M */
+        TCO_ICH3,       /* ICH3-S */
+        TCO_ICH3M,      /* ICH3-M */
+        TCO_ICH4,       /* ICH4 */
+        TCO_ICH4M,      /* ICH4-M */
+        TCO_CICH,       /* C-ICH */
+        TCO_ICH5,       /* ICH5 & ICH5R */
+        TCO_6300ESB,    /* 6300ESB */
+        TCO_ICH6,       /* ICH6 & ICH6R */
+        TCO_ICH6M,      /* ICH6-M */
+        TCO_ICH6W,      /* ICH6W & ICH6RW */
+        TCO_ICH7,       /* ICH7 & ICH7R */
+        TCO_ICH7M,      /* ICH7-M */
+        TCO_ICH7MDH,    /* ICH7-M DH */
+        TCO_ICH8,       /* ICH8 & ICH8R */
+        TCO_ICH8DH,     /* ICH8DH */
+        TCO_ICH8DO,     /* ICH8DO */
+};
+
+static struct {
+        char *name;
+        unsigned int iTCO_version;
+} iTCO_chipset_info[] __devinitdata = {
+        {"ICH", 1},
+        {"ICH0", 1},
+        {"ICH2", 1},
+        {"ICH2-M", 1},
+        {"ICH3-S", 1},
+        {"ICH3-M", 1},
+        {"ICH4", 1},
+        {"ICH4-M", 1},
+        {"C-ICH", 1},
+        {"ICH5 or ICH5R", 1},
+        {"6300ESB", 1},
+        {"ICH6 or ICH6R", 2},
+        {"ICH6-M", 2},
+        {"ICH6W or ICH6RW", 2},
+        {"ICH7 or ICH7R", 2},
+        {"ICH7-M", 2},
+        {"ICH7-M DH", 2},
+        {"ICH8 or ICH8R", 2},
+        {"ICH8DH", 2},
+        {"ICH8DO", 2},
+        {NULL,0}
+};
+
+/*
+ * This data only exists for exporting the supported PCI ids
+ * via MODULE_DEVICE_TABLE.  We do not actually register a
+ * pci_driver, because the I/O Controller Hub has also other
+ * functions that probably will be registered by other drivers.
+ */
+static struct pci_device_id iTCO_wdt_pci_tbl[] = {
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH     },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH0    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH2    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH2M   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH3    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH3M   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH4    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH4M   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,    PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_CICH    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH5    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,       PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_6300ESB },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH6    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH6M   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH6W   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH7    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH7M   },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,     PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH7MDH },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8DH  },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8DO  },
+        { 0, },                 /* End of list */
+};
+MODULE_DEVICE_TABLE (pci, iTCO_wdt_pci_tbl);
+
+/* Address definitions for the TCO */
+#define TCOBASE         iTCO_wdt_private.ACPIBASE + 0x60        /* TCO base address                */
+#define SMI_EN          iTCO_wdt_private.ACPIBASE + 0x30        /* SMI Control and Enable Register */
+
+#define TCO_RLD         TCOBASE + 0x00  /* TCO Timer Reload and Current Value */
+#define TCOv1_TMR       TCOBASE + 0x01  /* TCOv1 Timer Initial Value    */
+#define TCO_DAT_IN      TCOBASE + 0x02  /* TCO Data In Register         */
+#define TCO_DAT_OUT     TCOBASE + 0x03  /* TCO Data Out Register        */
+#define TCO1_STS        TCOBASE + 0x04  /* TCO1 Status Register         */
+#define TCO2_STS        TCOBASE + 0x06  /* TCO2 Status Register         */
+#define TCO1_CNT        TCOBASE + 0x08  /* TCO1 Control Register        */
+#define TCO2_CNT        TCOBASE + 0x0a  /* TCO2 Control Register        */
+#define TCOv2_TMR       TCOBASE + 0x12  /* TCOv2 Timer Initial Value    */
+
+/* internal variables */
+static unsigned long is_active;
+static char expect_release;
+static struct {                         /* this is private data for the iTCO_wdt device */
+        unsigned int iTCO_version;      /* TCO version/generation */
+        unsigned long ACPIBASE;         /* The cards ACPIBASE address (TCOBASE = ACPIBASE+0x60) */
+        unsigned long __iomem *gcs;     /* NO_REBOOT flag is Memory-Mapped GCS register bit 5 (TCO version 2) */
+        spinlock_t io_lock;             /* the lock for io operations */
+        struct pci_dev *pdev;           /* the PCI-device */
+} iTCO_wdt_private;
+
+static struct platform_device *iTCO_wdt_platform_device;        /* the watchdog platform device */
+
+/* module parameters */
+#define WATCHDOG_HEARTBEAT 30   /* 30 sec default heartbeat */
+static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
+/* iTCO Vendor Specific Support hooks */
+#ifdef CONFIG_ITCO_VENDOR_SUPPORT
+extern void iTCO_vendor_pre_start(unsigned long, unsigned int);
+extern void iTCO_vendor_pre_stop(unsigned long);
+extern void iTCO_vendor_pre_keepalive(unsigned long, unsigned int);
+extern void iTCO_vendor_pre_set_heartbeat(unsigned int);
+extern int iTCO_vendor_check_noreboot_on(void);
+#else
+#define iTCO_vendor_pre_start(acpibase, heartbeat)      {}
+#define iTCO_vendor_pre_stop(acpibase)                  {}
+#define iTCO_vendor_pre_keepalive(acpibase,heartbeat)   {}
+#define iTCO_vendor_pre_set_heartbeat(heartbeat)        {}
+#define iTCO_vendor_check_noreboot_on()                 1       /* 1=check noreboot; 0=don't check */
+#endif
+
+/*
+ * Some TCO specific functions
+ */
+
+static inline unsigned int seconds_to_ticks(int seconds)
+{
+        /* the internal timer is stored as ticks which decrement
+         * every 0.6 seconds */
+        return (seconds * 10) / 6;
+}
+
+static void iTCO_wdt_set_NO_REBOOT_bit(void)
+{
+        u32 val32;
+
+        /* Set the NO_REBOOT bit: this disables reboots */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                val32 = readl(iTCO_wdt_private.gcs);
+                val32 |= 0x00000020;
+                writel(val32, iTCO_wdt_private.gcs);
+        } else if (iTCO_wdt_private.iTCO_version == 1) {
+                pci_read_config_dword(iTCO_wdt_private.pdev, 0xd4, &val32);
+                val32 |= 0x00000002;
+                pci_write_config_dword(iTCO_wdt_private.pdev, 0xd4, val32);
+        }
+}
+
+static int iTCO_wdt_unset_NO_REBOOT_bit(void)
+{
+        int ret = 0;
+        u32 val32;
+
+        /* Unset the NO_REBOOT bit: this enables reboots */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                val32 = readl(iTCO_wdt_private.gcs);
+                val32 &= 0xffffffdf;
+                writel(val32, iTCO_wdt_private.gcs);
+
+                val32 = readl(iTCO_wdt_private.gcs);
+                if (val32 & 0x00000020)
+                        ret = -EIO;
+        } else if (iTCO_wdt_private.iTCO_version == 1) {
+                pci_read_config_dword(iTCO_wdt_private.pdev, 0xd4, &val32);
+                val32 &= 0xfffffffd;
+                pci_write_config_dword(iTCO_wdt_private.pdev, 0xd4, val32);
+
+                pci_read_config_dword(iTCO_wdt_private.pdev, 0xd4, &val32);
+                if (val32 & 0x00000002)
+                        ret = -EIO;
+        }
+
+        return ret; /* returns: 0 = OK, -EIO = Error */
+}
+
+static int iTCO_wdt_start(void)
+{
+        unsigned int val;
+
+        spin_lock(&iTCO_wdt_private.io_lock);
+
+        iTCO_vendor_pre_start(iTCO_wdt_private.ACPIBASE, heartbeat);
+
+        /* disable chipset's NO_REBOOT bit */
+        if (iTCO_wdt_unset_NO_REBOOT_bit()) {
+                printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
+                return -EIO;
+        }
+
+        /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */
+        val = inw(TCO1_CNT);
+        val &= 0xf7ff;
+        outw(val, TCO1_CNT);
+        val = inw(TCO1_CNT);
+        spin_unlock(&iTCO_wdt_private.io_lock);
+
+        if (val & 0x0800)
+                return -1;
+        return 0;
+}
+
+static int iTCO_wdt_stop(void)
+{
+        unsigned int val;
+
+        spin_lock(&iTCO_wdt_private.io_lock);
+
+        iTCO_vendor_pre_stop(iTCO_wdt_private.ACPIBASE);
+
+        /* Bit 11: TCO Timer Halt -> 1 = The TCO timer is disabled */
+        val = inw(TCO1_CNT);
+        val |= 0x0800;
+        outw(val, TCO1_CNT);
+        val = inw(TCO1_CNT);
+
+        /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
+        iTCO_wdt_set_NO_REBOOT_bit();
+
+        spin_unlock(&iTCO_wdt_private.io_lock);
+
+        if ((val & 0x0800) == 0)
+                return -1;
+        return 0;
+}
+
+static int iTCO_wdt_keepalive(void)
+{
+        spin_lock(&iTCO_wdt_private.io_lock);
+
+        iTCO_vendor_pre_keepalive(iTCO_wdt_private.ACPIBASE, heartbeat);
+
+        /* Reload the timer by writing to the TCO Timer Counter register */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                outw(0x01, TCO_RLD);
+        } else if (iTCO_wdt_private.iTCO_version == 1) {
+                outb(0x01, TCO_RLD);
+        }
+
+        spin_unlock(&iTCO_wdt_private.io_lock);
+        return 0;
+}
+
+static int iTCO_wdt_set_heartbeat(int t)
+{
+        unsigned int val16;
+        unsigned char val8;
+        unsigned int tmrval;
+
+        tmrval = seconds_to_ticks(t);
+        /* from the specs: */
+        /* "Values of 0h-3h are ignored and should not be attempted" */
+        if (tmrval < 0x04)
+                return -EINVAL;
+        if (((iTCO_wdt_private.iTCO_version == 2) && (tmrval > 0x3ff)) ||
+            ((iTCO_wdt_private.iTCO_version == 1) && (tmrval > 0x03f)))
+                return -EINVAL;
+
+        iTCO_vendor_pre_set_heartbeat(tmrval);
+
+        /* Write new heartbeat to watchdog */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                spin_lock(&iTCO_wdt_private.io_lock);
+                val16 = inw(TCOv2_TMR);
+                val16 &= 0xfc00;
+                val16 |= tmrval;
+                outw(val16, TCOv2_TMR);
+                val16 = inw(TCOv2_TMR);
+                spin_unlock(&iTCO_wdt_private.io_lock);
+
+                if ((val16 & 0x3ff) != tmrval)
+                        return -EINVAL;
+        } else if (iTCO_wdt_private.iTCO_version == 1) {
+                spin_lock(&iTCO_wdt_private.io_lock);
+                val8 = inb(TCOv1_TMR);
+                val8 &= 0xc0;
+                val8 |= (tmrval & 0xff);
+                outb(val8, TCOv1_TMR);
+                val8 = inb(TCOv1_TMR);
+                spin_unlock(&iTCO_wdt_private.io_lock);
+
+                if ((val8 & 0x3f) != tmrval)
+                        return -EINVAL;
+        }
+
+        heartbeat = t;
+        return 0;
+}
+
+static int iTCO_wdt_get_timeleft (int *time_left)
+{
+        unsigned int val16;
+        unsigned char val8;
+
+        /* read the TCO Timer */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                spin_lock(&iTCO_wdt_private.io_lock);
+                val16 = inw(TCO_RLD);
+                val16 &= 0x3ff;
+                spin_unlock(&iTCO_wdt_private.io_lock);
+
+                *time_left = (val16 * 6) / 10;
+        } else if (iTCO_wdt_private.iTCO_version == 1) {
+                spin_lock(&iTCO_wdt_private.io_lock);
+                val8 = inb(TCO_RLD);
+                val8 &= 0x3f;
+                spin_unlock(&iTCO_wdt_private.io_lock);
+
+                *time_left = (val8 * 6) / 10;
+        } else
+                return -EINVAL;
+        return 0;
+}
+
+/*
+ *      /dev/watchdog handling
+ */
+
+static int iTCO_wdt_open (struct inode *inode, struct file *file)
+{
+        /* /dev/watchdog can only be opened once */
+        if (test_and_set_bit(0, &is_active))
+                return -EBUSY;
+
+        /*
+         *      Reload and activate timer
+         */
+        iTCO_wdt_keepalive();
+        iTCO_wdt_start();
+        return nonseekable_open(inode, file);
+}
+
+static int iTCO_wdt_release (struct inode *inode, struct file *file)
+{
+        /*
+         *      Shut off the timer.
+         */
+        if (expect_release == 42) {
+                iTCO_wdt_stop();
+        } else {
+                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                iTCO_wdt_keepalive();
+        }
+        clear_bit(0, &is_active);
+        expect_release = 0;
+        return 0;
+}
+
+static ssize_t iTCO_wdt_write (struct file *file, const char __user *data,
+                              size_t len, loff_t * ppos)
+{
+        /* See if we got the magic character 'V' and reload the timer */
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* note: just in case someone wrote the magic character
+                         * five months ago... */
+                        expect_release = 0;
+
+                        /* scan to see whether or not we got the magic character */
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data+i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_release = 42;
+                        }
+                }
+
+                /* someone wrote to us, we should reload the timer */
+                iTCO_wdt_keepalive();
+        }
+        return len;
+}
+
+static int iTCO_wdt_ioctl (struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg)
+{
+        int new_options, retval = -EINVAL;
+        int new_heartbeat;
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
+        static struct watchdog_info ident = {
+                .options =              WDIOF_SETTIMEOUT |
+                                        WDIOF_KEEPALIVEPING |
+                                        WDIOF_MAGICCLOSE,
+                .firmware_version =     0,
+                .identity =             DRV_NAME,
+        };
+
+        switch (cmd) {
+                case WDIOC_GETSUPPORT:
+                        return copy_to_user(argp, &ident,
+                                sizeof (ident)) ? -EFAULT : 0;
+
+                case WDIOC_GETSTATUS:
+                case WDIOC_GETBOOTSTATUS:
+                        return put_user(0, p);
+
+                case WDIOC_KEEPALIVE:
+                        iTCO_wdt_keepalive();
+                        return 0;
+
+                case WDIOC_SETOPTIONS:
+                {
+                        if (get_user(new_options, p))
+                                return -EFAULT;
+
+                        if (new_options & WDIOS_DISABLECARD) {
+                                iTCO_wdt_stop();
+                                retval = 0;
+                        }
+
+                        if (new_options & WDIOS_ENABLECARD) {
+                                iTCO_wdt_keepalive();
+                                iTCO_wdt_start();
+                                retval = 0;
+                        }
+
+                        return retval;
+                }
+
+                case WDIOC_SETTIMEOUT:
+                {
+                        if (get_user(new_heartbeat, p))
+                                return -EFAULT;
+
+                        if (iTCO_wdt_set_heartbeat(new_heartbeat))
+                                return -EINVAL;
+
+                        iTCO_wdt_keepalive();
+                        /* Fall */
+                }
+
+                case WDIOC_GETTIMEOUT:
+                        return put_user(heartbeat, p);
+
+                case WDIOC_GETTIMELEFT:
+                {
+                        int time_left;
+
+                        if (iTCO_wdt_get_timeleft(&time_left))
+                                return -EINVAL;
+
+                        return put_user(time_left, p);
+                }
+
+                default:
+                        return -ENOTTY;
+        }
+}
+
+/*
+ *      Kernel Interfaces
+ */
+
+static struct file_operations iTCO_wdt_fops = {
+        .owner =        THIS_MODULE,
+        .llseek =       no_llseek,
+        .write =        iTCO_wdt_write,
+        .ioctl =        iTCO_wdt_ioctl,
+        .open =         iTCO_wdt_open,
+        .release =      iTCO_wdt_release,
+};
+
+static struct miscdevice iTCO_wdt_miscdev = {
+        .minor =        WATCHDOG_MINOR,
+        .name =         "watchdog",
+        .fops =         &iTCO_wdt_fops,
+};
+
+/*
+ *      Init & exit routines
+ */
+
+static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent, struct platform_device *dev)
+{
+        int ret;
+        u32 base_address;
+        unsigned long RCBA;
+        unsigned long val32;
+
+        /*
+         *      Find the ACPI/PM base I/O address which is the base
+         *      for the TCO registers (TCOBASE=ACPIBASE + 0x60)
+         *      ACPIBASE is bits [15:7] from 0x40-0x43
+         */
+        pci_read_config_dword(pdev, 0x40, &base_address);
+        base_address &= 0x00007f80;
+        if (base_address == 0x00000000) {
+                /* Something's wrong here, ACPIBASE has to be set */
+                printk(KERN_ERR PFX "failed to get TCOBASE address\n");
+                pci_dev_put(pdev);
+                return -ENODEV;
+        }
+        iTCO_wdt_private.iTCO_version = iTCO_chipset_info[ent->driver_data].iTCO_version;
+        iTCO_wdt_private.ACPIBASE = base_address;
+        iTCO_wdt_private.pdev = pdev;
+
+        /* Get the Memory-Mapped GCS register, we need it for the NO_REBOOT flag (TCO v2) */
+        /* To get access to it you have to read RCBA from PCI Config space 0xf0
+           and use it as base. GCS = RCBA + ICH6_GCS(0x3410). */
+        if (iTCO_wdt_private.iTCO_version == 2) {
+                pci_read_config_dword(pdev, 0xf0, &base_address);
+                RCBA = base_address & 0xffffc000;
+                iTCO_wdt_private.gcs = ioremap((RCBA + 0x3410),4);
+        }
+
+        /* Check chipset's NO_REBOOT bit */
+        if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) {
+                printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
+                ret = -ENODEV;  /* Cannot reset NO_REBOOT bit */
+                goto out;
+        }
+
+        /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
+        iTCO_wdt_set_NO_REBOOT_bit();
+
+        /* Set the TCO_EN bit in SMI_EN register */
+        if (!request_region(SMI_EN, 4, "iTCO_wdt")) {
+                printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n",
+                        SMI_EN );
+                ret = -EIO;
+                goto out;
+        }
+        val32 = inl(SMI_EN);
+        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+        outl(val32, SMI_EN);
+        release_region(SMI_EN, 4);
+
+        /* The TCO I/O registers reside in a 32-byte range pointed to by the TCOBASE value */
+        if (!request_region (TCOBASE, 0x20, "iTCO_wdt")) {
+                printk (KERN_ERR PFX "I/O address 0x%04lx already in use\n",
+                        TCOBASE);
+                ret = -EIO;
+                goto out;
+        }
+
+        printk(KERN_INFO PFX "Found a %s TCO device (Version=%d, TCOBASE=0x%04lx)\n",
+                iTCO_chipset_info[ent->driver_data].name,
+                iTCO_chipset_info[ent->driver_data].iTCO_version,
+                TCOBASE);
+
+        /* Clear out the (probably old) status */
+        outb(0, TCO1_STS);
+        outb(3, TCO2_STS);
+
+        /* Make sure the watchdog is not running */
+        iTCO_wdt_stop();
+
+        /* Check that the heartbeat value is within it's range ; if not reset to the default */
+        if (iTCO_wdt_set_heartbeat(heartbeat)) {
+                iTCO_wdt_set_heartbeat(WATCHDOG_HEARTBEAT);
+                printk(KERN_INFO PFX "heartbeat value must be 2<heartbeat<39 (TCO v1) or 613 (TCO v2), using %d\n",
+                        heartbeat);
+        }
+
+        ret = misc_register(&iTCO_wdt_miscdev);
+        if (ret != 0) {
+                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+                        WATCHDOG_MINOR, ret);
+                goto unreg_region;
+        }
+
+        printk (KERN_INFO PFX "initialized. heartbeat=%d sec (nowayout=%d)\n",
+                heartbeat, nowayout);
+
+        return 0;
+
+unreg_region:
+        release_region (TCOBASE, 0x20);
+out:
+        if (iTCO_wdt_private.iTCO_version == 2)
+                iounmap(iTCO_wdt_private.gcs);
+        pci_dev_put(iTCO_wdt_private.pdev);
+        iTCO_wdt_private.ACPIBASE = 0;
+        return ret;
+}
+
+static void iTCO_wdt_cleanup(void)
+{
+        /* Stop the timer before we leave */
+        if (!nowayout)
+                iTCO_wdt_stop();
+
+        /* Deregister */
+        misc_deregister(&iTCO_wdt_miscdev);
+        release_region(TCOBASE, 0x20);
+        if (iTCO_wdt_private.iTCO_version == 2)
+                iounmap(iTCO_wdt_private.gcs);
+        pci_dev_put(iTCO_wdt_private.pdev);
+        iTCO_wdt_private.ACPIBASE = 0;
+}
+
+static int iTCO_wdt_probe(struct platform_device *dev)
+{
+        int found = 0;
+        struct pci_dev *pdev = NULL;
+        const struct pci_device_id *ent;
+
+        spin_lock_init(&iTCO_wdt_private.io_lock);
+
+        for_each_pci_dev(pdev) {
+                ent = pci_match_id(iTCO_wdt_pci_tbl, pdev);
+                if (ent) {
+                        if (!(iTCO_wdt_init(pdev, ent, dev))) {
+                                found++;
+                                break;
+                        }
+                }
+        }
+
+        if (!found) {
+                printk(KERN_INFO PFX "No card detected\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int iTCO_wdt_remove(struct platform_device *dev)
+{
+        if (iTCO_wdt_private.ACPIBASE)
+                iTCO_wdt_cleanup();
+
+        return 0;
+}
+
+static void iTCO_wdt_shutdown(struct platform_device *dev)
+{
+        iTCO_wdt_stop();
+}
+
+#define iTCO_wdt_suspend NULL
+#define iTCO_wdt_resume  NULL
+
+static struct platform_driver iTCO_wdt_driver = {
+        .probe          = iTCO_wdt_probe,
+        .remove         = iTCO_wdt_remove,
+        .shutdown       = iTCO_wdt_shutdown,
+        .suspend        = iTCO_wdt_suspend,
+        .resume         = iTCO_wdt_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = DRV_NAME,
+        },
+};
+
+static int __init iTCO_wdt_init_module(void)
+{
+        int err;
+
+        printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s (%s)\n",
+                DRV_VERSION, DRV_RELDATE);
+
+        err = platform_driver_register(&iTCO_wdt_driver);
+        if (err)
+                return err;
+
+        iTCO_wdt_platform_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0);
+        if (IS_ERR(iTCO_wdt_platform_device)) {
+                err = PTR_ERR(iTCO_wdt_platform_device);
+                goto unreg_platform_driver;
+        }
+
+        return 0;
+
+unreg_platform_driver:
+        platform_driver_unregister(&iTCO_wdt_driver);
+        return err;
+}
+
+static void __exit iTCO_wdt_cleanup_module(void)
+{
+        platform_device_unregister(iTCO_wdt_platform_device);
+        platform_driver_unregister(&iTCO_wdt_driver);
+        printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
+}
+
+module_init(iTCO_wdt_init_module);
+module_exit(iTCO_wdt_cleanup_module);
+
+MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>");
+MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver");
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/char/watchdog/ib700wdt.c
index fd95f7327798..c1ed209a138c 100644
--- a/drivers/char/watchdog/ib700wdt.c
+++ b/drivers/char/watchdog/ib700wdt.c
@@ -199,7 +199,7 @@ ibwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
           break;
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index 26ceee7a4df0..dd6760f1a23b 100644
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -295,7 +295,7 @@ static int asr_ioctl(struct inode *inode, struct file *file,
                 }
         }
 
-        return -ENOIOCTLCMD;
+        return -ENOTTY;
 }
 
 static int asr_open(struct inode *inode, struct file *file)
diff --git a/drivers/char/watchdog/indydog.c b/drivers/char/watchdog/indydog.c
index dacc1c20a310..0bc239308989 100644
--- a/drivers/char/watchdog/indydog.c
+++ b/drivers/char/watchdog/indydog.c
@@ -112,7 +112,7 @@ static int indydog_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         if (copy_to_user((struct watchdog_info *)arg,
                                          &ident, sizeof(ident)))
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index 692908819e26..fd955dbd588c 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -1,5 +1,5 @@
 /*
- * drivers/watchdog/ixp2000_wdt.c
+ * drivers/char/watchdog/ixp2000_wdt.c
  *
  * Watchdog driver for Intel IXP2000 network processors
  *
@@ -107,7 +107,7 @@ static int
 ixp2000_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
 
         switch (cmd) {
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index 9db5cf2c38c3..5864bb865cfe 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -1,5 +1,5 @@
 /*
- * drivers/watchdog/ixp4xx_wdt.c
+ * drivers/char/watchdog/ixp4xx_wdt.c
  *
  * Watchdog driver for Intel IXP4xx network processors
  *
@@ -102,7 +102,7 @@ static int
 ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
 
         switch (cmd) {
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 23734e07fb22..276577d08fba 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -329,7 +329,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         break;
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 
         return 0;
@@ -426,8 +426,7 @@ static int __init zf_init(void)
         printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");
 
         ret = zf_get_ZFL_version();
-        printk("%#x\n", ret);
-        if((!ret) || (ret != 0xffff)){
+        if ((!ret) || (ret == 0xffff)) {
                 printk(KERN_WARNING PFX ": no ZF-Logic found\n");
                 return -ENODEV;
         }
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index ae943324d251..c2dac0aa1d62 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -185,7 +185,7 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
                         mixcomwd_ping();
                         break;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c
index a480903ee1a5..18ca752e2f90 100644
--- a/drivers/char/watchdog/mpc83xx_wdt.c
+++ b/drivers/char/watchdog/mpc83xx_wdt.c
@@ -125,7 +125,7 @@ static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
         case WDIOC_GETTIMEOUT:
                 return put_user(timeout_sec, p);
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c
index 35dd9e6e1140..8aaed10dd499 100644
--- a/drivers/char/watchdog/mpc8xx_wdt.c
+++ b/drivers/char/watchdog/mpc8xx_wdt.c
@@ -126,7 +126,7 @@ static int mpc8xx_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 54b3c56ead0d..3404a9c67f08 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(mpcore_noboot, "MPcore watchdog action, set to 1 to ignore rebo
  *      This is the interrupt handler.  Note that we only use this
  *      in testing mode, so don't actually do a reboot here.
  */
-static irqreturn_t mpcore_wdt_fire(int irq, void *arg, struct pt_regs *regs)
+static irqreturn_t mpcore_wdt_fire(int irq, void *arg)
 {
         struct mpcore_wdt *wdt = arg;
 
@@ -221,7 +221,7 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
         } uarg;
 
         if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
@@ -271,7 +271,7 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         if (ret == 0 && _IOC_DIR(cmd) & _IOC_READ) {
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index 5c8fab345b40..b887cdb01334 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -160,7 +160,7 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
new file mode 100644
index 000000000000..5dbd7dc2936f
--- /dev/null
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -0,0 +1,390 @@
+/*
+ * linux/drivers/char/watchdog/omap_wdt.c
+ *
+ * Watchdog driver for the TI OMAP 16xx & 24xx 32KHz (non-secure) watchdog
+ *
+ * Author: MontaVista Software, Inc.
+ *       <gdavis@mvista.com> or <source@mvista.com>
+ *
+ * 2003 (c) MontaVista Software, Inc. This file is licensed under the
+ * terms of the GNU General Public License version 2. This program is
+ * licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * History:
+ *
+ * 20030527: George G. Davis <gdavis@mvista.com>
+ *      Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
+ *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
+ *      Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *
+ * Copyright (c) 2004 Texas Instruments.
+ *      1. Modified to support OMAP1610 32-KHz watchdog timer
+ *      2. Ported to 2.6 kernel
+ *
+ * Copyright (c) 2005 David Brownell
+ *      Use the driver model and standard identifiers; handle bigger timeouts.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/reboot.h>
+#include <linux/smp_lock.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/moduleparam.h>
+#include <linux/clk.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/hardware.h>
+#include <asm/bitops.h>
+
+#include <asm/arch/prcm.h>
+
+#include "omap_wdt.h"
+
+static unsigned timer_margin;
+module_param(timer_margin, uint, 0);
+MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
+
+static int omap_wdt_users;
+static struct clk *armwdt_ck = NULL;
+static struct clk *mpu_wdt_ick = NULL;
+static struct clk *mpu_wdt_fck = NULL;
+
+static unsigned int wdt_trgr_pattern = 0x1234;
+
+static void omap_wdt_ping(void)
+{
+        /* wait for posted write to complete */
+        while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x08)
+                cpu_relax();
+        wdt_trgr_pattern = ~wdt_trgr_pattern;
+        omap_writel(wdt_trgr_pattern, (OMAP_WATCHDOG_TGR));
+        /* wait for posted write to complete */
+        while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x08)
+                cpu_relax();
+        /* reloaded WCRR from WLDR */
+}
+
+static void omap_wdt_enable(void)
+{
+        /* Sequence to enable the watchdog */
+        omap_writel(0xBBBB, OMAP_WATCHDOG_SPR);
+        while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x10)
+                cpu_relax();
+        omap_writel(0x4444, OMAP_WATCHDOG_SPR);
+        while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x10)
+                cpu_relax();
+}
+
+static void omap_wdt_disable(void)
+{
+        /* sequence required to disable watchdog */
+        omap_writel(0xAAAA, OMAP_WATCHDOG_SPR); /* TIMER_MODE */
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x10)
+                cpu_relax();
+        omap_writel(0x5555, OMAP_WATCHDOG_SPR); /* TIMER_MODE */
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x10)
+                cpu_relax();
+}
+
+static void omap_wdt_adjust_timeout(unsigned new_timeout)
+{
+        if (new_timeout < TIMER_MARGIN_MIN)
+                new_timeout = TIMER_MARGIN_DEFAULT;
+        if (new_timeout > TIMER_MARGIN_MAX)
+                new_timeout = TIMER_MARGIN_MAX;
+        timer_margin = new_timeout;
+}
+
+static void omap_wdt_set_timeout(void)
+{
+        u32 pre_margin = GET_WLDR_VAL(timer_margin);
+
+        /* just count up at 32 KHz */
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x04)
+                cpu_relax();
+        omap_writel(pre_margin, OMAP_WATCHDOG_LDR);
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x04)
+                cpu_relax();
+}
+
+/*
+ *      Allow only one task to hold it open
+ */
+
+static int omap_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(1, (unsigned long *)&omap_wdt_users))
+                return -EBUSY;
+
+        if (cpu_is_omap16xx())
+                clk_enable(armwdt_ck);  /* Enable the clock */
+
+        if (cpu_is_omap24xx()) {
+                clk_enable(mpu_wdt_ick);    /* Enable the interface clock */
+                clk_enable(mpu_wdt_fck);    /* Enable the functional clock */
+        }
+
+        /* initialize prescaler */
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x01)
+                cpu_relax();
+        omap_writel((1 << 5) | (PTV << 2), OMAP_WATCHDOG_CNTRL);
+        while (omap_readl(OMAP_WATCHDOG_WPS) & 0x01)
+                cpu_relax();
+
+        omap_wdt_set_timeout();
+        omap_wdt_enable();
+        return 0;
+}
+
+static int omap_wdt_release(struct inode *inode, struct file *file)
+{
+        /*
+         *      Shut off the timer unless NOWAYOUT is defined.
+         */
+#ifndef CONFIG_WATCHDOG_NOWAYOUT
+        omap_wdt_disable();
+
+        if (cpu_is_omap16xx()) {
+                clk_disable(armwdt_ck); /* Disable the clock */
+                clk_put(armwdt_ck);
+                armwdt_ck = NULL;
+        }
+
+        if (cpu_is_omap24xx()) {
+                clk_disable(mpu_wdt_ick);       /* Disable the clock */
+                clk_disable(mpu_wdt_fck);       /* Disable the clock */
+                clk_put(mpu_wdt_ick);
+                clk_put(mpu_wdt_fck);
+                mpu_wdt_ick = NULL;
+                mpu_wdt_fck = NULL;
+        }
+#else
+        printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");
+#endif
+        omap_wdt_users = 0;
+        return 0;
+}
+
+static ssize_t
+omap_wdt_write(struct file *file, const char __user *data,
+                size_t len, loff_t *ppos)
+{
+        /* Refresh LOAD_TIME. */
+        if (len)
+                omap_wdt_ping();
+        return len;
+}
+
+static int
+omap_wdt_ioctl(struct inode *inode, struct file *file,
+        unsigned int cmd, unsigned long arg)
+{
+        int new_margin;
+        static struct watchdog_info ident = {
+                .identity = "OMAP Watchdog",
+                .options = WDIOF_SETTIMEOUT,
+                .firmware_version = 0,
+        };
+
+        switch (cmd) {
+        default:
+                return -ENOIOCTLCMD;
+        case WDIOC_GETSUPPORT:
+                return copy_to_user((struct watchdog_info __user *)arg, &ident,
+                                sizeof(ident));
+        case WDIOC_GETSTATUS:
+                return put_user(0, (int __user *)arg);
+        case WDIOC_GETBOOTSTATUS:
+                if (cpu_is_omap16xx())
+                        return put_user(omap_readw(ARM_SYSST),
+                                        (int __user *)arg);
+                if (cpu_is_omap24xx())
+                        return put_user(omap_prcm_get_reset_sources(),
+                                        (int __user *)arg);
+        case WDIOC_KEEPALIVE:
+                omap_wdt_ping();
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_margin, (int __user *)arg))
+                        return -EFAULT;
+                omap_wdt_adjust_timeout(new_margin);
+
+                omap_wdt_disable();
+                omap_wdt_set_timeout();
+                omap_wdt_enable();
+
+                omap_wdt_ping();
+                /* Fall */
+        case WDIOC_GETTIMEOUT:
+                return put_user(timer_margin, (int __user *)arg);
+        }
+}
+
+static struct file_operations omap_wdt_fops = {
+        .owner = THIS_MODULE,
+        .write = omap_wdt_write,
+        .ioctl = omap_wdt_ioctl,
+        .open = omap_wdt_open,
+        .release = omap_wdt_release,
+};
+
+static struct miscdevice omap_wdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &omap_wdt_fops
+};
+
+static int __init omap_wdt_probe(struct platform_device *pdev)
+{
+        struct resource *res, *mem;
+        int ret;
+
+        /* reserve static register mappings */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENOENT;
+
+        mem = request_mem_region(res->start, res->end - res->start + 1,
+                                 pdev->name);
+        if (mem == NULL)
+                return -EBUSY;
+
+        platform_set_drvdata(pdev, mem);
+
+        omap_wdt_users = 0;
+
+        if (cpu_is_omap16xx()) {
+                armwdt_ck = clk_get(&pdev->dev, "armwdt_ck");
+                if (IS_ERR(armwdt_ck)) {
+                        ret = PTR_ERR(armwdt_ck);
+                        armwdt_ck = NULL;
+                        goto fail;
+                }
+        }
+
+        if (cpu_is_omap24xx()) {
+                mpu_wdt_ick = clk_get(&pdev->dev, "mpu_wdt_ick");
+                if (IS_ERR(mpu_wdt_ick)) {
+                        ret = PTR_ERR(mpu_wdt_ick);
+                        mpu_wdt_ick = NULL;
+                        goto fail;
+                }
+                mpu_wdt_fck = clk_get(&pdev->dev, "mpu_wdt_fck");
+                if (IS_ERR(mpu_wdt_fck)) {
+                        ret = PTR_ERR(mpu_wdt_fck);
+                        mpu_wdt_fck = NULL;
+                        goto fail;
+                }
+        }
+
+        omap_wdt_disable();
+        omap_wdt_adjust_timeout(timer_margin);
+
+        omap_wdt_miscdev.dev = &pdev->dev;
+        ret = misc_register(&omap_wdt_miscdev);
+        if (ret)
+                goto fail;
+
+        pr_info("OMAP Watchdog Timer: initial timeout %d sec\n", timer_margin);
+
+        /* autogate OCP interface clock */
+        omap_writel(0x01, OMAP_WATCHDOG_SYS_CONFIG);
+        return 0;
+
+fail:
+        if (armwdt_ck)
+                clk_put(armwdt_ck);
+        if (mpu_wdt_ick)
+                clk_put(mpu_wdt_ick);
+        if (mpu_wdt_fck)
+                clk_put(mpu_wdt_fck);
+        release_resource(mem);
+        return ret;
+}
+
+static void omap_wdt_shutdown(struct platform_device *pdev)
+{
+        omap_wdt_disable();
+}
+
+static int omap_wdt_remove(struct platform_device *pdev)
+{
+        struct resource *mem = platform_get_drvdata(pdev);
+        misc_deregister(&omap_wdt_miscdev);
+        release_resource(mem);
+        if (armwdt_ck)
+                clk_put(armwdt_ck);
+        if (mpu_wdt_ick)
+                clk_put(mpu_wdt_ick);
+        if (mpu_wdt_fck)
+                clk_put(mpu_wdt_fck);
+        return 0;
+}
+
+#ifdef  CONFIG_PM
+
+/* REVISIT ... not clear this is the best way to handle system suspend; and
+ * it's very inappropriate for selective device suspend (e.g. suspending this
+ * through sysfs rather than by stopping the watchdog daemon).  Also, this
+ * may not play well enough with NOWAYOUT...
+ */
+
+static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        if (omap_wdt_users)
+                omap_wdt_disable();
+        return 0;
+}
+
+static int omap_wdt_resume(struct platform_device *pdev)
+{
+        if (omap_wdt_users) {
+                omap_wdt_enable();
+                omap_wdt_ping();
+        }
+        return 0;
+}
+
+#else
+#define omap_wdt_suspend        NULL
+#define omap_wdt_resume         NULL
+#endif
+
+static struct platform_driver omap_wdt_driver = {
+        .probe          = omap_wdt_probe,
+        .remove         = omap_wdt_remove,
+        .shutdown       = omap_wdt_shutdown,
+        .suspend        = omap_wdt_suspend,
+        .resume         = omap_wdt_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "omap_wdt",
+        },
+};
+
+static int __init omap_wdt_init(void)
+{
+        return platform_driver_register(&omap_wdt_driver);
+}
+
+static void __exit omap_wdt_exit(void)
+{
+        platform_driver_unregister(&omap_wdt_driver);
+}
+
+module_init(omap_wdt_init);
+module_exit(omap_wdt_exit);
+
+MODULE_AUTHOR("George G. Davis");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/omap_wdt.h b/drivers/char/watchdog/omap_wdt.h
new file mode 100644
index 000000000000..52a532a5114a
--- /dev/null
+++ b/drivers/char/watchdog/omap_wdt.h
@@ -0,0 +1,64 @@
+/*
+ *  linux/drivers/char/watchdog/omap_wdt.h
+ *
+ *  BRIEF MODULE DESCRIPTION
+ *      OMAP Watchdog timer register definitions
+ *
+ *  Copyright (C) 2004 Texas Instruments.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _OMAP_WATCHDOG_H
+#define _OMAP_WATCHDOG_H
+
+#define OMAP1610_WATCHDOG_BASE          0xfffeb000
+#define OMAP2420_WATCHDOG_BASE          0x48022000      /*WDT Timer 2 */
+
+#ifdef CONFIG_ARCH_OMAP24XX
+#define OMAP_WATCHDOG_BASE              OMAP2420_WATCHDOG_BASE
+#else
+#define OMAP_WATCHDOG_BASE              OMAP1610_WATCHDOG_BASE
+#define RM_RSTST_WKUP                   0
+#endif
+
+#define OMAP_WATCHDOG_REV               (OMAP_WATCHDOG_BASE + 0x00)
+#define OMAP_WATCHDOG_SYS_CONFIG        (OMAP_WATCHDOG_BASE + 0x10)
+#define OMAP_WATCHDOG_STATUS            (OMAP_WATCHDOG_BASE + 0x14)
+#define OMAP_WATCHDOG_CNTRL             (OMAP_WATCHDOG_BASE + 0x24)
+#define OMAP_WATCHDOG_CRR               (OMAP_WATCHDOG_BASE + 0x28)
+#define OMAP_WATCHDOG_LDR               (OMAP_WATCHDOG_BASE + 0x2c)
+#define OMAP_WATCHDOG_TGR               (OMAP_WATCHDOG_BASE + 0x30)
+#define OMAP_WATCHDOG_WPS               (OMAP_WATCHDOG_BASE + 0x34)
+#define OMAP_WATCHDOG_SPR               (OMAP_WATCHDOG_BASE + 0x48)
+
+/* Using the prescaler, the OMAP watchdog could go for many
+ * months before firing.  These limits work without scaling,
+ * with the 60 second default assumed by most tools and docs.
+ */
+#define TIMER_MARGIN_MAX        (24 * 60 * 60)  /* 1 day */
+#define TIMER_MARGIN_DEFAULT    60      /* 60 secs */
+#define TIMER_MARGIN_MIN        1
+
+#define PTV                     0       /* prescale */
+#define GET_WLDR_VAL(secs)      (0xffffffff - ((secs) * (32768/(1<<PTV))) + 1)
+
+#endif                          /* _OMAP_WATCHDOG_H */
diff --git a/drivers/char/watchdog/pc87413_wdt.c b/drivers/char/watchdog/pc87413_wdt.c
new file mode 100644
index 000000000000..1d447e32af41
--- /dev/null
+++ b/drivers/char/watchdog/pc87413_wdt.c
@@ -0,0 +1,635 @@
+/*
+ *      NS pc87413-wdt Watchdog Timer driver for Linux 2.6.x.x
+ *
+ *      This code is based on wdt.c with original copyright.
+ *
+ *      (C) Copyright 2006 Sven Anders, <anders@anduras.de>
+ *                     and Marcus Junker, <junker@anduras.de>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      Neither Sven Anders, Marcus Junker nor ANDURAS AG
+ *      admit liability nor provide warranty for any of this software.
+ *      This material is provided "AS-IS" and at no charge.
+ *
+ *      Release 1.1
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/ioport.h>
+#include <linux/delay.h>
+#include <linux/notifier.h>
+#include <linux/fs.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/moduleparam.h>
+#include <linux/version.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+/* #define DEBUG 1 */
+
+#define DEFAULT_TIMEOUT     1            /* 1 minute */
+#define MAX_TIMEOUT         255
+
+#define VERSION             "1.1"
+#define MODNAME             "pc87413 WDT"
+#define PFX                 MODNAME ": "
+#define DPFX                MODNAME " - DEBUG: "
+
+#define WDT_INDEX_IO_PORT   (io+0)       /* I/O port base (index register) */
+#define WDT_DATA_IO_PORT    (WDT_INDEX_IO_PORT+1)
+#define SWC_LDN             0x04
+#define SIOCFG2             0x22         /* Serial IO register */
+#define WDCTL               0x10         /* Watchdog-Timer-Controll-Register */
+#define WDTO                0x11         /* Watchdog timeout register */
+#define WDCFG               0x12         /* Watchdog config register */
+
+static int io = 0x2E;                    /* Address used on Portwell Boards */
+
+static int timeout = DEFAULT_TIMEOUT;    /* timeout value */
+static unsigned long timer_enabled = 0;  /* is the timer enabled? */
+
+static char expect_close;                /* is the close expected? */
+
+static spinlock_t io_lock;               /* to guard the watchdog from io races */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+
+/* -- Low level function ----------------------------------------*/
+
+/* Select pins for Watchdog output */
+
+static inline void pc87413_select_wdt_out (void)
+{
+        unsigned int cr_data = 0;
+
+        /* Step 1: Select multiple pin,pin55,as WDT output */
+
+        outb_p(SIOCFG2, WDT_INDEX_IO_PORT);
+
+        cr_data = inb (WDT_DATA_IO_PORT);
+
+        cr_data |= 0x80; /* Set Bit7 to 1*/
+        outb_p(SIOCFG2, WDT_INDEX_IO_PORT);
+
+        outb_p(cr_data, WDT_DATA_IO_PORT);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Select multiple pin,pin55,as WDT output:"
+                              " Bit7 to 1: %d\n", cr_data);
+#endif
+}
+
+/* Enable SWC functions */
+
+static inline void pc87413_enable_swc(void)
+{
+        unsigned int cr_data=0;
+
+        /* Step 2: Enable SWC functions */
+
+        outb_p(0x07, WDT_INDEX_IO_PORT);        /* Point SWC_LDN (LDN=4) */
+        outb_p(SWC_LDN, WDT_DATA_IO_PORT);
+
+        outb_p(0x30, WDT_INDEX_IO_PORT);        /* Read Index 0x30 First */
+        cr_data = inb(WDT_DATA_IO_PORT);
+        cr_data |= 0x01;                        /* Set Bit0 to 1 */
+        outb_p(0x30, WDT_INDEX_IO_PORT);
+        outb_p(cr_data, WDT_DATA_IO_PORT);      /* Index0x30_bit0P1 */
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "pc87413 - Enable SWC functions\n");
+#endif
+}
+
+/* Read SWC I/O base address */
+
+static inline unsigned int pc87413_get_swc_base(void)
+{
+        unsigned int  swc_base_addr = 0;
+        unsigned char addr_l, addr_h = 0;
+
+        /* Step 3: Read SWC I/O Base Address */
+
+        outb_p(0x60, WDT_INDEX_IO_PORT);        /* Read Index 0x60 */
+        addr_h = inb(WDT_DATA_IO_PORT);
+
+        outb_p(0x61, WDT_INDEX_IO_PORT);        /* Read Index 0x61 */
+
+        addr_l = inb(WDT_DATA_IO_PORT);
+
+        swc_base_addr = (addr_h << 8) + addr_l;
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Read SWC I/O Base Address: low %d, high %d,"
+                              " res %d\n", addr_l, addr_h, swc_base_addr);
+#endif
+
+        return swc_base_addr;
+}
+
+/* Select Bank 3 of SWC */
+
+static inline void pc87413_swc_bank3(unsigned int swc_base_addr)
+{
+        /* Step 4: Select Bank3 of SWC */
+
+        outb_p(inb(swc_base_addr + 0x0f) | 0x03, swc_base_addr + 0x0f);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Select Bank3 of SWC\n");
+#endif
+}
+
+/* Set watchdog timeout to x minutes */
+
+static inline void pc87413_programm_wdto(unsigned int swc_base_addr,
+                                         char pc87413_time)
+{
+        /* Step 5: Programm WDTO, Twd. */
+
+        outb_p(pc87413_time, swc_base_addr + WDTO);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Set WDTO to %d minutes\n", pc87413_time);
+#endif
+}
+
+/* Enable WDEN */
+
+static inline void pc87413_enable_wden(unsigned int swc_base_addr)
+{
+        /* Step 6: Enable WDEN */
+
+        outb_p(inb (swc_base_addr + WDCTL) | 0x01, swc_base_addr + WDCTL);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Enable WDEN\n");
+#endif
+}
+
+/* Enable SW_WD_TREN */
+static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr)
+{
+        /* Enable SW_WD_TREN */
+
+        outb_p(inb (swc_base_addr + WDCFG) | 0x80, swc_base_addr + WDCFG);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Enable SW_WD_TREN\n");
+#endif
+}
+
+/* Disable SW_WD_TREN */
+
+static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr)
+{
+        /* Disable SW_WD_TREN */
+
+        outb_p(inb (swc_base_addr + WDCFG) & 0x7f, swc_base_addr + WDCFG);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "pc87413 - Disable SW_WD_TREN\n");
+#endif
+}
+
+/* Enable SW_WD_TRG */
+
+static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr)
+{
+        /* Enable SW_WD_TRG */
+
+        outb_p(inb (swc_base_addr + WDCTL) | 0x80, swc_base_addr + WDCTL);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "pc87413 - Enable SW_WD_TRG\n");
+#endif
+}
+
+/* Disable SW_WD_TRG */
+
+static inline void pc87413_disable_sw_wd_trg(unsigned int swc_base_addr)
+{
+        /* Disable SW_WD_TRG */
+
+        outb_p(inb (swc_base_addr + WDCTL) & 0x7f, swc_base_addr + WDCTL);
+
+#ifdef DEBUG
+        printk(KERN_INFO DPFX "Disable SW_WD_TRG\n");
+#endif
+}
+
+/* -- Higher level functions ------------------------------------*/
+
+/* Enable the watchdog */
+
+static void pc87413_enable(void)
+{
+        unsigned int swc_base_addr;
+
+        spin_lock(&io_lock);
+
+        pc87413_select_wdt_out();
+        pc87413_enable_swc();
+        swc_base_addr = pc87413_get_swc_base();
+        pc87413_swc_bank3(swc_base_addr);
+        pc87413_programm_wdto(swc_base_addr, timeout);
+        pc87413_enable_wden(swc_base_addr);
+        pc87413_enable_sw_wd_tren(swc_base_addr);
+        pc87413_enable_sw_wd_trg(swc_base_addr);
+
+        spin_unlock(&io_lock);
+}
+
+/* Disable the watchdog */
+
+static void pc87413_disable(void)
+{
+        unsigned int swc_base_addr;
+
+        spin_lock(&io_lock);
+
+        pc87413_select_wdt_out();
+        pc87413_enable_swc();
+        swc_base_addr = pc87413_get_swc_base();
+        pc87413_swc_bank3(swc_base_addr);
+        pc87413_disable_sw_wd_tren(swc_base_addr);
+        pc87413_disable_sw_wd_trg(swc_base_addr);
+        pc87413_programm_wdto(swc_base_addr, 0);
+
+        spin_unlock(&io_lock);
+}
+
+/* Refresh the watchdog */
+
+static void pc87413_refresh(void)
+{
+        unsigned int swc_base_addr;
+
+        spin_lock(&io_lock);
+
+        pc87413_select_wdt_out();
+        pc87413_enable_swc();
+        swc_base_addr = pc87413_get_swc_base();
+        pc87413_swc_bank3(swc_base_addr);
+        pc87413_disable_sw_wd_tren(swc_base_addr);
+        pc87413_disable_sw_wd_trg(swc_base_addr);
+        pc87413_programm_wdto(swc_base_addr, timeout);
+        pc87413_enable_wden(swc_base_addr);
+        pc87413_enable_sw_wd_tren(swc_base_addr);
+        pc87413_enable_sw_wd_trg(swc_base_addr);
+
+        spin_unlock(&io_lock);
+}
+
+/* -- File operations -------------------------------------------*/
+
+/**
+ *      pc87413_open:
+ *      @inode: inode of device
+ *      @file: file handle to device
+ *
+ */
+
+static int pc87413_open(struct inode *inode, struct file *file)
+{
+        /* /dev/watchdog can only be opened once */
+
+        if (test_and_set_bit(0, &timer_enabled))
+                return -EBUSY;
+
+        if (nowayout)
+                __module_get(THIS_MODULE);
+
+        /* Reload and activate timer */
+        pc87413_refresh();
+
+        printk(KERN_INFO MODNAME "Watchdog enabled. Timeout set to"
+                                 " %d minute(s).\n", timeout);
+
+        return nonseekable_open(inode, file);
+}
+
+/**
+ *      pc87413_release:
+ *      @inode: inode to board
+ *      @file: file handle to board
+ *
+ *      The watchdog has a configurable API. There is a religious dispute
+ *      between people who want their watchdog to be able to shut down and
+ *      those who want to be sure if the watchdog manager dies the machine
+ *      reboots. In the former case we disable the counters, in the latter
+ *      case you have to open it again very soon.
+ */
+
+static int pc87413_release(struct inode *inode, struct file *file)
+{
+        /* Shut off the timer. */
+
+        if (expect_close == 42) {
+                pc87413_disable();
+                printk(KERN_INFO MODNAME "Watchdog disabled,"
+                                         " sleeping again...\n");
+        } else {
+                printk(KERN_CRIT MODNAME "Unexpected close, not stopping"
+                                         " watchdog!\n");
+                pc87413_refresh();
+        }
+
+        clear_bit(0, &timer_enabled);
+        expect_close = 0;
+
+        return 0;
+}
+
+/**
+ *      pc87413_status:
+ *
+ *      return, if the watchdog is enabled (timeout is set...)
+ */
+
+
+static int pc87413_status(void)
+{
+          return 0; /* currently not supported */
+}
+
+/**
+ *      pc87413_write:
+ *      @file: file handle to the watchdog
+ *      @data: data buffer to write
+ *      @len: length in bytes
+ *      @ppos: pointer to the position to write. No seeks allowed
+ *
+ *      A write to a watchdog device is defined as a keepalive signal. Any
+ *      write of data will do, as we we don't define content meaning.
+ */
+
+static ssize_t pc87413_write(struct file *file, const char __user *data,
+                             size_t len, loff_t *ppos)
+{
+        /* See if we got the magic character 'V' and reload the timer */
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* reset expect flag */
+                        expect_close = 0;
+
+                        /* scan to see whether or not we got the magic character */
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data+i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 42;
+                        }
+                }
+
+                /* someone wrote to us, we should reload the timer */
+                pc87413_refresh();
+        }
+        return len;
+}
+
+/**
+ *      pc87413_ioctl:
+ *      @inode: inode of the device
+ *      @file: file handle to the device
+ *      @cmd: watchdog command
+ *      @arg: argument pointer
+ *
+ *      The watchdog API defines a common set of functions for all watchdogs
+ *      according to their available features. We only actually usefully support
+ *      querying capabilities and current status.
+ */
+
+static int pc87413_ioctl(struct inode *inode, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        int new_timeout;
+
+        union {
+                struct watchdog_info __user *ident;
+                int __user *i;
+        } uarg;
+
+        static struct watchdog_info ident = {
+                .options          = WDIOF_KEEPALIVEPING |
+                                    WDIOF_SETTIMEOUT |
+                                    WDIOF_MAGICCLOSE,
+                .firmware_version = 1,
+                .identity         = "PC87413(HF/F) watchdog"
+        };
+
+        uarg.i = (int __user *)arg;
+
+        switch(cmd) {
+                default:
+                        return -ENOTTY;
+
+                case WDIOC_GETSUPPORT:
+                        return copy_to_user(uarg.ident, &ident,
+                                sizeof(ident)) ? -EFAULT : 0;
+
+                case WDIOC_GETSTATUS:
+                        return put_user(pc87413_status(), uarg.i);
+
+                case WDIOC_GETBOOTSTATUS:
+                        return put_user(0, uarg.i);
+
+                case WDIOC_KEEPALIVE:
+                        pc87413_refresh();
+#ifdef DEBUG
+                        printk(KERN_INFO DPFX "keepalive\n");
+#endif
+                        return 0;
+
+                case WDIOC_SETTIMEOUT:
+                        if (get_user(new_timeout, uarg.i))
+                                return -EFAULT;
+
+                        // the API states this is given in secs
+                        new_timeout /= 60;
+
+                        if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)
+                                return -EINVAL;
+
+                        timeout = new_timeout;
+                        pc87413_refresh();
+
+                        // fall through and return the new timeout...
+
+                case WDIOC_GETTIMEOUT:
+
+                        new_timeout = timeout * 60;
+
+                        return put_user(new_timeout, uarg.i);
+
+                case WDIOC_SETOPTIONS:
+                {
+                        int options, retval = -EINVAL;
+
+                        if (get_user(options, uarg.i))
+                                return -EFAULT;
+
+                        if (options & WDIOS_DISABLECARD) {
+                                pc87413_disable();
+                                retval = 0;
+                        }
+
+                        if (options & WDIOS_ENABLECARD) {
+                                pc87413_enable();
+                                retval = 0;
+                        }
+
+                        return retval;
+                }
+        }
+}
+
+/* -- Notifier funtions -----------------------------------------*/
+
+/**
+ *      notify_sys:
+ *      @this: our notifier block
+ *      @code: the event being reported
+ *      @unused: unused
+ *
+ *      Our notifier is called on system shutdowns. We want to turn the card
+ *      off at reboot otherwise the machine will reboot again during memory
+ *      test or worse yet during the following fsck. This would suck, in fact
+ *      trust me - if it happens it does suck.
+ */
+
+static int pc87413_notify_sys(struct notifier_block *this,
+                              unsigned long code,
+                              void *unused)
+{
+        if (code == SYS_DOWN || code == SYS_HALT)
+        {
+                /* Turn the card off */
+                pc87413_disable();
+        }
+        return NOTIFY_DONE;
+}
+
+/* -- Module's structures ---------------------------------------*/
+
+static struct file_operations pc87413_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = pc87413_write,
+        .ioctl          = pc87413_ioctl,
+        .open           = pc87413_open,
+        .release        = pc87413_release,
+};
+
+static struct notifier_block pc87413_notifier =
+{
+        .notifier_call  = pc87413_notify_sys,
+};
+
+static struct miscdevice pc87413_miscdev=
+{
+        .minor          = WATCHDOG_MINOR,
+        .name           = "watchdog",
+        .fops           = &pc87413_fops
+};
+
+/* -- Module init functions -------------------------------------*/
+
+/**
+ *      pc87413_init: module's "constructor"
+ *
+ *      Set up the WDT watchdog board. All we have to do is grab the
+ *      resources we require and bitch if anyone beat us to them.
+ *      The open() function will actually kick the board off.
+ */
+
+static int __init pc87413_init(void)
+{
+        int ret;
+
+        spin_lock_init(&io_lock);
+
+        printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n", WDT_INDEX_IO_PORT);
+
+        /* request_region(io, 2, "pc87413"); */
+
+        ret = register_reboot_notifier(&pc87413_notifier);
+        if (ret != 0) {
+                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
+                        ret);
+        }
+
+        ret = misc_register(&pc87413_miscdev);
+
+        if (ret != 0) {
+                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+                        WATCHDOG_MINOR, ret);
+                unregister_reboot_notifier(&pc87413_notifier);
+                return ret;
+        }
+
+        printk(KERN_INFO PFX "initialized. timeout=%d min \n", timeout);
+
+        pc87413_enable();
+
+        return 0;
+}
+
+/**
+ *      pc87413_exit: module's "destructor"
+ *
+ *      Unload the watchdog. You cannot do this with any file handles open.
+ *      If your watchdog is set to continue ticking on close and you unload
+ *      it, well it keeps ticking. We won't get the interrupt but the board
+ *      will not touch PC memory so all is fine. You just have to load a new
+ *      module in 60 seconds or reboot.
+ */
+
+static void __exit pc87413_exit(void)
+{
+        /* Stop the timer before we leave */
+        if (!nowayout)
+        {
+                pc87413_disable();
+                printk(KERN_INFO MODNAME "Watchdog disabled.\n");
+        }
+
+        misc_deregister(&pc87413_miscdev);
+        unregister_reboot_notifier(&pc87413_notifier);
+        /* release_region(io,2); */
+
+        printk(MODNAME " watchdog component driver removed.\n");
+}
+
+module_init(pc87413_init);
+module_exit(pc87413_exit);
+
+MODULE_AUTHOR("Sven Anders <anders@anduras.de>, Marcus Junker <junker@anduras.de>,");
+MODULE_DESCRIPTION("PC87413 WDT driver");
+MODULE_LICENSE("GPL");
+
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
+module_param(io, int, 0);
+MODULE_PARM_DESC(io, MODNAME " I/O port (default: " __MODULE_STRING(io) ").");
+
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes (default=" __MODULE_STRING(timeout) ").");
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index cd7d1b6a5d9f..8e1e6e48e0a7 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -49,7 +49,6 @@
  *      More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
  */
 
-#include <linux/config.h>       /* For CONFIG_WATCHDOG_NOWAYOUT/... */
 #include <linux/module.h>       /* For module specific items */
 #include <linux/moduleparam.h>  /* For new moduleparam's */
 #include <linux/types.h>        /* For standard types (like size_t) */
@@ -572,7 +571,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
 
         switch(cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 if(copy_to_user(argp, &ident, sizeof(ident)))
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
index c7cfd6dbfe1b..f4872c871063 100644
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -31,7 +31,6 @@
  *      Includes, defines, variables, module parameters, ...
  */
 
-#include <linux/config.h>       /* For CONFIG_WATCHDOG_NOWAYOUT/... */
 #include <linux/module.h>       /* For module specific items */
 #include <linux/moduleparam.h>  /* For new moduleparam's */
 #include <linux/types.h>        /* For standard types (like size_t) */
@@ -541,7 +540,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index b7ae73dcdd08..61138726b501 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -158,7 +158,7 @@ static struct usb_driver usb_pcwd_driver = {
 };
 
 
-static void usb_pcwd_intr_done(struct urb *urb, struct pt_regs *regs)
+static void usb_pcwd_intr_done(struct urb *urb)
 {
         struct usb_pcwd_private *usb_pcwd = (struct usb_pcwd_private *)urb->context;
         unsigned char *data = usb_pcwd->intr_buffer;
@@ -445,7 +445,7 @@ static int usb_pcwd_ioctl(struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -561,8 +561,7 @@ static struct notifier_block usb_pcwd_notifier = {
  */
 static inline void usb_pcwd_delete (struct usb_pcwd_private *usb_pcwd)
 {
-        if (usb_pcwd->intr_urb != NULL)
-                usb_free_urb (usb_pcwd->intr_urb);
+        usb_free_urb(usb_pcwd->intr_urb);
         if (usb_pcwd->intr_buffer != NULL)
                 usb_buffer_free(usb_pcwd->udev, usb_pcwd->intr_size,
                                 usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
@@ -635,7 +634,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
         usb_pcwd->intr_size = (le16_to_cpu(endpoint->wMaxPacketSize) > 8 ? le16_to_cpu(endpoint->wMaxPacketSize) : 8);
 
         /* set up the memory buffer's */
-        if (!(usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, SLAB_ATOMIC, &usb_pcwd->intr_dma))) {
+        if (!(usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, GFP_ATOMIC, &usb_pcwd->intr_dma))) {
                 printk(KERN_ERR PFX "Out of memory\n");
                 goto error;
         }
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
new file mode 100644
index 000000000000..3a55fc6abcd8
--- /dev/null
+++ b/drivers/char/watchdog/pnx4008_wdt.c
@@ -0,0 +1,361 @@
+/*
+ * drivers/char/watchdog/pnx4008_wdt.c
+ *
+ * Watchdog driver for PNX4008 board
+ *
+ * Authors: Dmitry Chigirev <source@mvista.com>,
+ *          Vitaly Wool <vitalywool@gmail.com>
+ * Based on sa1100 driver,
+ * Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
+ *
+ * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/spinlock.h>
+
+#include <asm/hardware.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#define MODULE_NAME "PNX4008-WDT: "
+
+/* WatchDog Timer - Chapter 23 Page 207 */
+
+#define DEFAULT_HEARTBEAT 19
+#define MAX_HEARTBEAT     60
+
+/* Watchdog timer register set definition */
+#define WDTIM_INT(p)     ((p) + 0x0)
+#define WDTIM_CTRL(p)    ((p) + 0x4)
+#define WDTIM_COUNTER(p) ((p) + 0x8)
+#define WDTIM_MCTRL(p)   ((p) + 0xC)
+#define WDTIM_MATCH0(p)  ((p) + 0x10)
+#define WDTIM_EMR(p)     ((p) + 0x14)
+#define WDTIM_PULSE(p)   ((p) + 0x18)
+#define WDTIM_RES(p)     ((p) + 0x1C)
+
+/* WDTIM_INT bit definitions */
+#define MATCH_INT      1
+
+/* WDTIM_CTRL bit definitions */
+#define COUNT_ENAB     1
+#define RESET_COUNT    (1<<1)
+#define DEBUG_EN       (1<<2)
+
+/* WDTIM_MCTRL bit definitions */
+#define MR0_INT        1
+#undef  RESET_COUNT0
+#define RESET_COUNT0   (1<<2)
+#define STOP_COUNT0    (1<<2)
+#define M_RES1         (1<<3)
+#define M_RES2         (1<<4)
+#define RESFRC1        (1<<5)
+#define RESFRC2        (1<<6)
+
+/* WDTIM_EMR bit definitions */
+#define EXT_MATCH0      1
+#define MATCH_OUTPUT_HIGH (2<<4)        /*a MATCH_CTRL setting */
+
+/* WDTIM_RES bit definitions */
+#define WDOG_RESET      1       /* read only */
+
+#define WDOG_COUNTER_RATE 13000000      /*the counter clock is 13 MHz fixed */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+static int heartbeat = DEFAULT_HEARTBEAT;
+
+static spinlock_t io_lock;
+static unsigned long wdt_status;
+#define WDT_IN_USE        0
+#define WDT_OK_TO_CLOSE   1
+#define WDT_REGION_INITED 2
+#define WDT_DEVICE_INITED 3
+
+static unsigned long boot_status;
+
+static struct resource  *wdt_mem;
+static void __iomem     *wdt_base;
+struct clk              *wdt_clk;
+
+static void wdt_enable(void)
+{
+        spin_lock(&io_lock);
+
+        if (wdt_clk)
+                clk_set_rate(wdt_clk, 1);
+
+        /* stop counter, initiate counter reset */
+        __raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
+        /*wait for reset to complete. 100% guarantee event */
+        while (__raw_readl(WDTIM_COUNTER(wdt_base)))
+                cpu_relax();
+        /* internal and external reset, stop after that */
+        __raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0,
+                WDTIM_MCTRL(wdt_base));
+        /* configure match output */
+        __raw_writel(MATCH_OUTPUT_HIGH, WDTIM_EMR(wdt_base));
+        /* clear interrupt, just in case */
+        __raw_writel(MATCH_INT, WDTIM_INT(wdt_base));
+        /* the longest pulse period 65541/(13*10^6) seconds ~ 5 ms. */
+        __raw_writel(0xFFFF, WDTIM_PULSE(wdt_base));
+        __raw_writel(heartbeat * WDOG_COUNTER_RATE, WDTIM_MATCH0(wdt_base));
+        /*enable counter, stop when debugger active */
+        __raw_writel(COUNT_ENAB | DEBUG_EN, WDTIM_CTRL(wdt_base));
+
+        spin_unlock(&io_lock);
+}
+
+static void wdt_disable(void)
+{
+        spin_lock(&io_lock);
+
+        __raw_writel(0, WDTIM_CTRL(wdt_base));  /*stop counter */
+        if (wdt_clk)
+                clk_set_rate(wdt_clk, 0);
+
+        spin_unlock(&io_lock);
+}
+
+static int pnx4008_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
+                return -EBUSY;
+
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        wdt_enable();
+
+        return nonseekable_open(inode, file);
+}
+
+static ssize_t
+pnx4008_wdt_write(struct file *file, const char *data, size_t len,
+                  loff_t * ppos)
+{
+        /*  Can't seek (pwrite) on this device  */
+        if (ppos != &file->f_pos)
+                return -ESPIPE;
+
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        set_bit(WDT_OK_TO_CLOSE, &wdt_status);
+                        }
+                }
+                wdt_enable();
+        }
+
+        return len;
+}
+
+static struct watchdog_info ident = {
+        .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
+            WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+        .identity = "PNX4008 Watchdog",
+};
+
+static int
+pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+                  unsigned long arg)
+{
+        int ret = -ENOTTY;
+        int time;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user((struct watchdog_info *)arg, &ident,
+                                   sizeof(ident)) ? -EFAULT : 0;
+                break;
+
+        case WDIOC_GETSTATUS:
+                ret = put_user(0, (int *)arg);
+                break;
+
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(boot_status, (int *)arg);
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                ret = get_user(time, (int *)arg);
+                if (ret)
+                        break;
+
+                if (time <= 0 || time > MAX_HEARTBEAT) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                heartbeat = time;
+                wdt_enable();
+                /* Fall through */
+
+        case WDIOC_GETTIMEOUT:
+                ret = put_user(heartbeat, (int *)arg);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                wdt_enable();
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+static int pnx4008_wdt_release(struct inode *inode, struct file *file)
+{
+        if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status))
+                printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n");
+
+        wdt_disable();
+        clear_bit(WDT_IN_USE, &wdt_status);
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        return 0;
+}
+
+static struct file_operations pnx4008_wdt_fops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .write = pnx4008_wdt_write,
+        .ioctl = pnx4008_wdt_ioctl,
+        .open = pnx4008_wdt_open,
+        .release = pnx4008_wdt_release,
+};
+
+static struct miscdevice pnx4008_wdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &pnx4008_wdt_fops,
+};
+
+static int pnx4008_wdt_probe(struct platform_device *pdev)
+{
+        int ret = 0, size;
+        struct resource *res;
+
+        spin_lock_init(&io_lock);
+
+        if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
+                heartbeat = DEFAULT_HEARTBEAT;
+
+        printk(KERN_INFO MODULE_NAME
+                "PNX4008 Watchdog Timer: heartbeat %d sec\n", heartbeat);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                printk(KERN_INFO MODULE_NAME
+                        "failed to get memory region resouce\n");
+                return -ENOENT;
+        }
+
+        size = res->end - res->start + 1;
+        wdt_mem = request_mem_region(res->start, size, pdev->name);
+
+        if (wdt_mem == NULL) {
+                printk(KERN_INFO MODULE_NAME "failed to get memory region\n");
+                return -ENOENT;
+        }
+        wdt_base = (void __iomem *)IO_ADDRESS(res->start);
+
+        wdt_clk = clk_get(&pdev->dev, "wdt_ck");
+        if (!wdt_clk) {
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                goto out;
+        } else
+                clk_set_rate(wdt_clk, 1);
+
+        ret = misc_register(&pnx4008_wdt_miscdev);
+        if (ret < 0) {
+                printk(KERN_ERR MODULE_NAME "cannot register misc device\n");
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                clk_set_rate(wdt_clk, 0);
+        } else {
+                boot_status = (__raw_readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ?
+                    WDIOF_CARDRESET : 0;
+                wdt_disable();          /*disable for now */
+                set_bit(WDT_DEVICE_INITED, &wdt_status);
+        }
+
+out:
+        return ret;
+}
+
+static int pnx4008_wdt_remove(struct platform_device *pdev)
+{
+        misc_deregister(&pnx4008_wdt_miscdev);
+        if (wdt_clk) {
+                clk_set_rate(wdt_clk, 0);
+                clk_put(wdt_clk);
+                wdt_clk = NULL;
+        }
+        if (wdt_mem) {
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                wdt_mem = NULL;
+        }
+        return 0;
+}
+
+static struct platform_driver platform_wdt_driver = {
+        .driver = {
+                .name = "watchdog",
+        },
+        .probe = pnx4008_wdt_probe,
+        .remove = pnx4008_wdt_remove,
+};
+
+static int __init pnx4008_wdt_init(void)
+{
+        return platform_driver_register(&platform_wdt_driver);
+}
+
+static void __exit pnx4008_wdt_exit(void)
+{
+        return platform_driver_unregister(&platform_wdt_driver);
+}
+
+module_init(pnx4008_wdt_init);
+module_exit(pnx4008_wdt_exit);
+
+MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
+MODULE_DESCRIPTION("PNX4008 Watchdog Driver");
+
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat,
+                 "Watchdog heartbeat period in seconds from 1 to "
+                 __MODULE_STRING(MAX_HEARTBEAT) ", default "
+                 __MODULE_STRING(DEFAULT_HEARTBEAT));
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout,
+                 "Set to 1 to keep watchdog running after device release");
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/rm9k_wdt.c b/drivers/char/watchdog/rm9k_wdt.c
new file mode 100644
index 000000000000..ec3909371c21
--- /dev/null
+++ b/drivers/char/watchdog/rm9k_wdt.c
@@ -0,0 +1,420 @@
+/*
+ *  Watchdog implementation for GPI h/w found on PMC-Sierra RM9xxx
+ *  chips.
+ *
+ *  Copyright (C) 2004 by Basler Vision Technologies AG
+ *  Author: Thomas Koeller <thomas.koeller@baslerweb.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/interrupt.h>
+#include <linux/fs.h>
+#include <linux/reboot.h>
+#include <linux/notifier.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <asm/io.h>
+#include <asm/atomic.h>
+#include <asm/processor.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+#include <asm/rm9k-ocd.h>
+
+#include <rm9k_wdt.h>
+
+
+#define CLOCK                  125000000
+#define MAX_TIMEOUT_SECONDS    32
+#define CPCCR                  0x0080
+#define CPGIG1SR               0x0044
+#define CPGIG1ER               0x0054
+
+
+/* Function prototypes */
+static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *);
+static void wdt_gpi_start(void);
+static void wdt_gpi_stop(void);
+static void wdt_gpi_set_timeout(unsigned int);
+static int wdt_gpi_open(struct inode *, struct file *);
+static int wdt_gpi_release(struct inode *, struct file *);
+static ssize_t wdt_gpi_write(struct file *, const char __user *, size_t, loff_t *);
+static long wdt_gpi_ioctl(struct file *, unsigned int, unsigned long);
+static int wdt_gpi_notify(struct notifier_block *, unsigned long, void *);
+static const struct resource *wdt_gpi_get_resource(struct platform_device *, const char *, unsigned int);
+static int __init wdt_gpi_probe(struct device *);
+static int __exit wdt_gpi_remove(struct device *);
+
+
+static const char wdt_gpi_name[] = "wdt_gpi";
+static atomic_t opencnt;
+static int expect_close;
+static int locked;
+
+
+/* These are set from device resources */
+static void __iomem * wd_regs;
+static unsigned int wd_irq, wd_ctr;
+
+
+/* Module arguments */
+static int timeout = MAX_TIMEOUT_SECONDS;
+module_param(timeout, int, 0444);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
+
+static unsigned long resetaddr = 0xbffdc200;
+module_param(resetaddr, ulong, 0444);
+MODULE_PARM_DESC(resetaddr, "Address to write to to force a reset");
+
+static unsigned long flagaddr = 0xbffdc104;
+module_param(flagaddr, ulong, 0444);
+MODULE_PARM_DESC(flagaddr, "Address to write to boot flags to");
+
+static int powercycle;
+module_param(powercycle, bool, 0444);
+MODULE_PARM_DESC(powercycle, "Cycle power if watchdog expires");
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0444);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");
+
+
+/* Interrupt handler */
+static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs)
+{
+        if (!unlikely(__raw_readl(wd_regs + 0x0008) & 0x1))
+                return IRQ_NONE;
+        __raw_writel(0x1, wd_regs + 0x0008);
+
+
+        printk(KERN_CRIT "%s: watchdog expired - resetting system\n",
+                wdt_gpi_name);
+
+        *(volatile char *) flagaddr |= 0x01;
+        *(volatile char *) resetaddr = powercycle ? 0x01 : 0x2;
+        iob();
+        while (1)
+                cpu_relax();
+}
+
+
+/* Watchdog functions */
+static void wdt_gpi_start(void)
+{
+        u32 reg;
+
+        lock_titan_regs();
+        reg = titan_readl(CPGIG1ER);
+        titan_writel(reg | (0x100 << wd_ctr), CPGIG1ER);
+        iob();
+        unlock_titan_regs();
+}
+
+static void wdt_gpi_stop(void)
+{
+        u32 reg;
+
+        lock_titan_regs();
+        reg = titan_readl(CPCCR) & ~(0xf << (wd_ctr * 4));
+        titan_writel(reg, CPCCR);
+        reg = titan_readl(CPGIG1ER);
+        titan_writel(reg & ~(0x100 << wd_ctr), CPGIG1ER);
+        iob();
+        unlock_titan_regs();
+}
+
+static void wdt_gpi_set_timeout(unsigned int to)
+{
+        u32 reg;
+        const u32 wdval = (to * CLOCK) & ~0x0000000f;
+
+        lock_titan_regs();
+        reg = titan_readl(CPCCR) & ~(0xf << (wd_ctr * 4));
+        titan_writel(reg, CPCCR);
+        wmb();
+        __raw_writel(wdval, wd_regs + 0x0000);
+        wmb();
+        titan_writel(reg | (0x2 << (wd_ctr * 4)), CPCCR);
+        wmb();
+        titan_writel(reg | (0x5 << (wd_ctr * 4)), CPCCR);
+        iob();
+        unlock_titan_regs();
+}
+
+
+/* /dev/watchdog operations */
+static int wdt_gpi_open(struct inode *inode, struct file *file)
+{
+        int res;
+
+        if (unlikely(atomic_dec_if_positive(&opencnt) < 0))
+                return -EBUSY;
+
+        expect_close = 0;
+        if (locked) {
+                module_put(THIS_MODULE);
+                free_irq(wd_irq, &miscdev);
+                locked = 0;
+        }
+
+        res = request_irq(wd_irq, wdt_gpi_irqhdl, SA_SHIRQ | SA_INTERRUPT,
+                          wdt_gpi_name, &miscdev);
+        if (unlikely(res))
+                return res;
+
+        wdt_gpi_set_timeout(timeout);
+        wdt_gpi_start();
+
+        printk(KERN_INFO "%s: watchdog started, timeout = %u seconds\n",
+                wdt_gpi_name, timeout);
+        return nonseekable_open(inode, file);
+}
+
+static int wdt_gpi_release(struct inode *inode, struct file *file)
+{
+        if (nowayout) {
+                printk(KERN_INFO "%s: no way out - watchdog left running\n",
+                        wdt_gpi_name);
+                __module_get(THIS_MODULE);
+                locked = 1;
+        } else {
+                if (expect_close) {
+                        wdt_gpi_stop();
+                        free_irq(wd_irq, &miscdev);
+                        printk(KERN_INFO "%s: watchdog stopped\n", wdt_gpi_name);
+                } else {
+                        printk(KERN_CRIT "%s: unexpected close() -"
+                                " watchdog left running\n",
+                                wdt_gpi_name);
+                        wdt_gpi_set_timeout(timeout);
+                        __module_get(THIS_MODULE);
+                        locked = 1;
+                }
+        }
+
+        atomic_inc(&opencnt);
+        return 0;
+}
+
+static ssize_t
+wdt_gpi_write(struct file *f, const char __user *d, size_t s, loff_t *o)
+{
+        char val;
+
+        wdt_gpi_set_timeout(timeout);
+        expect_close = (s > 0) && !get_user(val, d) && (val == 'V');
+        return s ? 1 : 0;
+}
+
+static long
+wdt_gpi_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
+{
+        long res = -ENOTTY;
+        const long size = _IOC_SIZE(cmd);
+        int stat;
+        void __user *argp = (void __user *)arg;
+        static struct watchdog_info wdinfo = {
+                .identity               = "RM9xxx/GPI watchdog",
+                .firmware_version       = 0,
+                .options                = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING
+        };
+
+        if (unlikely(_IOC_TYPE(cmd) != WATCHDOG_IOCTL_BASE))
+                return -ENOTTY;
+
+        if ((_IOC_DIR(cmd) & _IOC_READ)
+            && !access_ok(VERIFY_WRITE, arg, size))
+                return -EFAULT;
+
+        if ((_IOC_DIR(cmd) & _IOC_WRITE)
+            && !access_ok(VERIFY_READ, arg, size))
+                return -EFAULT;
+
+        expect_close = 0;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                wdinfo.options = nowayout ?
+                        WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING :
+                        WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE;
+                res = __copy_to_user(argp, &wdinfo, size) ?  -EFAULT : size;
+                break;
+
+        case WDIOC_GETSTATUS:
+                break;
+
+        case WDIOC_GETBOOTSTATUS:
+                stat = (*(volatile char *) flagaddr & 0x01)
+                        ? WDIOF_CARDRESET : 0;
+                res = __copy_to_user(argp, &stat, size) ?
+                        -EFAULT : size;
+                break;
+
+        case WDIOC_SETOPTIONS:
+                break;
+
+        case WDIOC_KEEPALIVE:
+                wdt_gpi_set_timeout(timeout);
+                res = size;
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                {
+                        int val;
+                        if (unlikely(__copy_from_user(&val, argp, size))) {
+                                res = -EFAULT;
+                                break;
+                        }
+
+                        if (val > MAX_TIMEOUT_SECONDS)
+                                val = MAX_TIMEOUT_SECONDS;
+                        timeout = val;
+                        wdt_gpi_set_timeout(val);
+                        res = size;
+                        printk(KERN_INFO "%s: timeout set to %u seconds\n",
+                                wdt_gpi_name, timeout);
+                }
+                break;
+
+        case WDIOC_GETTIMEOUT:
+                res = __copy_to_user(argp, &timeout, size) ?
+                        -EFAULT : size;
+                break;
+        }
+
+        return res;
+}
+
+
+/* Shutdown notifier */
+static int
+wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
+{
+        if (code == SYS_DOWN || code == SYS_HALT)
+                wdt_gpi_stop();
+
+        return NOTIFY_DONE;
+}
+
+
+/* Kernel interfaces */
+static struct file_operations fops = {
+        .owner          = THIS_MODULE,
+        .open           = wdt_gpi_open,
+        .release        = wdt_gpi_release,
+        .write          = wdt_gpi_write,
+        .unlocked_ioctl = wdt_gpi_ioctl,
+};
+
+static struct miscdevice miscdev = {
+        .minor          = WATCHDOG_MINOR,
+        .name           = wdt_gpi_name,
+        .fops           = &fops,
+};
+
+static struct notifier_block wdt_gpi_shutdown = {
+        .notifier_call  = wdt_gpi_notify,
+};
+
+
+/* Init & exit procedures */
+static const struct resource *
+wdt_gpi_get_resource(struct platform_device *pdv, const char *name,
+                      unsigned int type)
+{
+        char buf[80];
+        if (snprintf(buf, sizeof buf, "%s_0", name) >= sizeof buf)
+                return NULL;
+        return platform_get_resource_byname(pdv, type, buf);
+}
+
+/* No hotplugging on the platform bus - use __init */
+static int __init wdt_gpi_probe(struct device *dev)
+{
+        int res;
+        struct platform_device * const pdv = to_platform_device(dev);
+        const struct resource
+                * const rr = wdt_gpi_get_resource(pdv, WDT_RESOURCE_REGS,
+                                                  IORESOURCE_MEM),
+                * const ri = wdt_gpi_get_resource(pdv, WDT_RESOURCE_IRQ,
+                                                  IORESOURCE_IRQ),
+                * const rc = wdt_gpi_get_resource(pdv, WDT_RESOURCE_COUNTER,
+                                                  0);
+
+        if (unlikely(!rr || !ri || !rc))
+                return -ENXIO;
+
+        wd_regs = ioremap_nocache(rr->start, rr->end + 1 - rr->start);
+        if (unlikely(!wd_regs))
+                return -ENOMEM;
+        wd_irq = ri->start;
+        wd_ctr = rc->start;
+        res = misc_register(&miscdev);
+        if (res)
+                iounmap(wd_regs);
+        else
+                register_reboot_notifier(&wdt_gpi_shutdown);
+        return res;
+}
+
+static int __exit wdt_gpi_remove(struct device *dev)
+{
+        int res;
+
+        unregister_reboot_notifier(&wdt_gpi_shutdown);
+        res = misc_deregister(&miscdev);
+        iounmap(wd_regs);
+        wd_regs = NULL;
+        return res;
+}
+
+
+/* Device driver init & exit */
+static struct device_driver wdt_gpi_driver = {
+        .name           = (char *) wdt_gpi_name,
+        .bus            = &platform_bus_type,
+        .owner          = THIS_MODULE,
+        .probe          = wdt_gpi_probe,
+        .remove         = __exit_p(wdt_gpi_remove),
+        .shutdown       = NULL,
+        .suspend        = NULL,
+        .resume         = NULL,
+};
+
+static int __init wdt_gpi_init_module(void)
+{
+        atomic_set(&opencnt, 1);
+        if (timeout > MAX_TIMEOUT_SECONDS)
+                timeout = MAX_TIMEOUT_SECONDS;
+        return driver_register(&wdt_gpi_driver);
+}
+
+static void __exit wdt_gpi_cleanup_module(void)
+{
+        driver_unregister(&wdt_gpi_driver);
+}
+
+module_init(wdt_gpi_init_module);
+module_exit(wdt_gpi_cleanup_module);
+
+MODULE_AUTHOR("Thomas Koeller <thomas.koeller@baslerweb.com>");
+MODULE_DESCRIPTION("Basler eXcite watchdog driver for gpi devices");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index be978e8ed754..18cb050c3862 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -62,7 +62,7 @@
 #define CONFIG_S3C2410_WATCHDOG_ATBOOT          (0)
 #define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME    (15)
 
-static int nowayout = WATCHDOG_NOWAYOUT;
+static int nowayout     = WATCHDOG_NOWAYOUT;
 static int tmr_margin   = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME;
 static int tmr_atboot   = CONFIG_S3C2410_WATCHDOG_ATBOOT;
 static int soft_noboot  = 0;
@@ -213,11 +213,10 @@ static int s3c2410wdt_open(struct inode *inode, struct file *file)
         if(down_trylock(&open_lock))
                 return -EBUSY;
 
-        if (nowayout) {
+        if (nowayout)
                 __module_get(THIS_MODULE);
-        } else {
-                allow_close = CLOSE_STATE_ALLOW;
-        }
+
+        allow_close = CLOSE_STATE_NOT;
 
         /* start the timer */
         s3c2410wdt_start();
@@ -230,6 +229,7 @@ static int s3c2410wdt_release(struct inode *inode, struct file *file)
          *      Shut off the timer.
          *      Lock it in if it's a module and we set nowayout
          */
+
         if (allow_close == CLOSE_STATE_ALLOW) {
                 s3c2410wdt_stop();
         } else {
@@ -288,7 +288,7 @@ static int s3c2410wdt_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
 
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &s3c2410_wdt_ident,
@@ -336,8 +336,7 @@ static struct miscdevice s3c2410wdt_miscdev = {
 
 /* interrupt handler code */
 
-static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
-                                  struct pt_regs *regs)
+static irqreturn_t s3c2410wdt_irq(int irqno, void *param)
 {
         printk(KERN_INFO PFX "Watchdog timer expired!\n");
 
@@ -381,18 +380,21 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
                 printk(KERN_INFO PFX "failed to get irq resource\n");
+                iounmap(wdt_base);
                 return -ENOENT;
         }
 
         ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
         if (ret != 0) {
                 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
+                iounmap(wdt_base);
                 return ret;
         }
 
         wdt_clock = clk_get(&pdev->dev, "watchdog");
         if (wdt_clock == NULL) {
                 printk(KERN_INFO PFX "failed to find watchdog clock source\n");
+                iounmap(wdt_base);
                 return -ENOENT;
         }
 
@@ -416,6 +418,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
         if (ret) {
                 printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n",
                         WATCHDOG_MINOR, ret);
+                iounmap(wdt_base);
                 return ret;
         }
 
@@ -452,6 +455,7 @@ static int s3c2410wdt_remove(struct platform_device *dev)
                 wdt_clock = NULL;
         }
 
+        iounmap(wdt_base);
         misc_deregister(&s3c2410wdt_miscdev);
         return 0;
 }
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index 1fc16d995788..33c1137f17d6 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -90,7 +90,7 @@ static struct watchdog_info ident = {
 static int sa1100dog_ioctl(struct inode *inode, struct file *file,
         unsigned int cmd, unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c
index 4663c2fd53cd..c7b2045bc76b 100644
--- a/drivers/char/watchdog/sbc60xxwdt.c
+++ b/drivers/char/watchdog/sbc60xxwdt.c
@@ -235,7 +235,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c
index bfc475dabe6d..8882b427d24f 100644
--- a/drivers/char/watchdog/sbc_epx_c3.c
+++ b/drivers/char/watchdog/sbc_epx_c3.c
@@ -141,7 +141,7 @@ static int epx_c3_ioctl(struct inode *inode, struct file *file,
 
                 return retval;
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 7c3cf293a5af..e3239833e4b0 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -180,7 +180,7 @@ static int sc1200wdt_ioctl(struct inode *inode, struct file *file, unsigned int
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;    /* Keep Pavel Machek amused ;) */
+                        return -ENOTTY;
 
                 case WDIOC_GETSUPPORT:
                         if (copy_to_user(argp, &ident, sizeof ident))
@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
         if (io == -1) {
                 printk(KERN_ERR PFX "io parameter must be specified\n");
                 ret = -EINVAL;
-                goto out_clean;
+                goto out_pnp;
         }
 
 #if defined CONFIG_PNP
@@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void)
         if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
                 printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
                 ret = -EBUSY;
-                goto out_clean;
+                goto out_pnp;
         }
 
         ret = sc1200wdt_probe();
@@ -435,6 +435,11 @@ out_rbt:
 out_io:
         release_region(io, io_len);
 
+out_pnp:
+#if defined CONFIG_PNP
+        if (isapnp)
+                pnp_unregister_driver(&scl200wdt_pnp_driver);
+#endif
         goto out_clean;
 }
 
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index 2c7c9db71be8..caec37ba750a 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -290,7 +290,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c561299a5537..fc0e0347f9d2 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -166,7 +166,7 @@ static int scx200_wdt_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         case WDIOC_GETSUPPORT:
                 if(copy_to_user(argp, &ident, sizeof(ident)))
                         return -EFAULT;
diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c
index 1355038f1044..dc403629aeb3 100644
--- a/drivers/char/watchdog/shwdt.c
+++ b/drivers/char/watchdog/shwdt.c
@@ -27,7 +27,7 @@
 #include <linux/notifier.h>
 #include <linux/ioport.h>
 #include <linux/fs.h>
-
+#include <linux/mm.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/watchdog.h>
@@ -125,7 +125,6 @@ static void sh_wdt_start(void)
 
 /**
  *      sh_wdt_stop - Stop the Watchdog
- *
  *      Stops the watchdog.
  */
 static void sh_wdt_stop(void)
@@ -141,22 +140,20 @@ static void sh_wdt_stop(void)
 
 /**
  *      sh_wdt_keepalive - Keep the Userspace Watchdog Alive
- *
  *      The Userspace watchdog got a KeepAlive: schedule the next heartbeat.
  */
-static void sh_wdt_keepalive(void)
+static inline void sh_wdt_keepalive(void)
 {
         next_heartbeat = jiffies + (heartbeat * HZ);
 }
 
 /**
  *      sh_wdt_set_heartbeat - Set the Userspace Watchdog heartbeat
- *
  *      Set the Userspace Watchdog heartbeat
  */
 static int sh_wdt_set_heartbeat(int t)
 {
-        if ((t < 1) || (t > 3600)) /* arbitrary upper limit */
+        if (unlikely((t < 1) || (t > 3600))) /* arbitrary upper limit */
                 return -EINVAL;
 
         heartbeat = t;
@@ -165,7 +162,6 @@ static int sh_wdt_set_heartbeat(int t)
 
 /**
  *      sh_wdt_ping - Ping the Watchdog
- *
  *      @data: Unused
  *
  *      Clears overflow bit, resets timer counter.
@@ -182,14 +178,13 @@ static void sh_wdt_ping(unsigned long data)
                 sh_wdt_write_cnt(0);
 
                 mod_timer(&timer, next_ping_period(clock_division_ratio));
-        } else {
-                printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
-        }
+        } else
+                printk(KERN_WARNING PFX "Heartbeat lost! Will not ping "
+                       "the watchdog\n");
 }
 
 /**
  *      sh_wdt_open - Open the Device
- *
  *      @inode: inode of device
  *      @file: file handle of device
  *
@@ -209,7 +204,6 @@ static int sh_wdt_open(struct inode *inode, struct file *file)
 
 /**
  *      sh_wdt_close - Close the Device
- *
  *      @inode: inode of device
  *      @file: file handle of device
  *
@@ -220,7 +214,8 @@ static int sh_wdt_close(struct inode *inode, struct file *file)
         if (shwdt_expect_close == 42) {
                 sh_wdt_stop();
         } else {
-                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                printk(KERN_CRIT PFX "Unexpected close, not "
+                       "stopping watchdog!\n");
                 sh_wdt_keepalive();
         }
 
@@ -232,7 +227,6 @@ static int sh_wdt_close(struct inode *inode, struct file *file)
 
 /**
  *      sh_wdt_write - Write to Device
- *
  *      @file: file handle of device
  *      @buf: buffer to write
  *      @count: length of buffer
@@ -264,8 +258,56 @@ static ssize_t sh_wdt_write(struct file *file, const char *buf,
 }
 
 /**
- *      sh_wdt_ioctl - Query Device
+ *      sh_wdt_mmap - map WDT/CPG registers into userspace
+ *      @file: file structure for the device
+ *      @vma: VMA to map the registers into
+ *
+ *      A simple mmap() implementation for the corner cases where the counter
+ *      needs to be mapped in userspace directly. Due to the relatively small
+ *      size of the area, neighbouring registers not necessarily tied to the
+ *      CPG will also be accessible through the register page, so this remains
+ *      configurable for users that really know what they're doing.
  *
+ *      Additionaly, the register page maps in the CPG register base relative
+ *      to the nearest page-aligned boundary, which requires that userspace do
+ *      the appropriate CPU subtype math for calculating the page offset for
+ *      the counter value.
+ */
+static int sh_wdt_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        int ret = -ENOSYS;
+
+#ifdef CONFIG_SH_WDT_MMAP
+        unsigned long addr;
+
+        /* Only support the simple cases where we map in a register page. */
+        if (((vma->vm_end - vma->vm_start) != PAGE_SIZE) || vma->vm_pgoff)
+                return -EINVAL;
+
+        /*
+         * Pick WTCNT as the start, it's usually the first register after the
+         * FRQCR, and neither one are generally page-aligned out of the box.
+         */
+        addr = WTCNT & ~(PAGE_SIZE - 1);
+
+        vma->vm_flags |= VM_IO;
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+        if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
+                               PAGE_SIZE, vma->vm_page_prot)) {
+                printk(KERN_ERR PFX "%s: io_remap_pfn_range failed\n",
+                       __FUNCTION__);
+                return -EAGAIN;
+        }
+
+        ret = 0;
+#endif
+
+        return ret;
+}
+
+/**
+ *      sh_wdt_ioctl - Query Device
  *      @inode: inode of device
  *      @file: file handle of device
  *      @cmd: watchdog command
@@ -318,7 +360,7 @@ static int sh_wdt_ioctl(struct inode *inode, struct file *file,
 
                         return retval;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 
         return 0;
@@ -326,7 +368,6 @@ static int sh_wdt_ioctl(struct inode *inode, struct file *file,
 
 /**
  *      sh_wdt_notify_sys - Notifier Handler
- *
  *      @this: notifier block
  *      @code: notifier event
  *      @unused: unused
@@ -337,9 +378,8 @@ static int sh_wdt_ioctl(struct inode *inode, struct file *file,
 static int sh_wdt_notify_sys(struct notifier_block *this,
                              unsigned long code, void *unused)
 {
-        if (code == SYS_DOWN || code == SYS_HALT) {
+        if (code == SYS_DOWN || code == SYS_HALT)
                 sh_wdt_stop();
-        }
 
         return NOTIFY_DONE;
 }
@@ -351,10 +391,12 @@ static const struct file_operations sh_wdt_fops = {
         .ioctl          = sh_wdt_ioctl,
         .open           = sh_wdt_open,
         .release        = sh_wdt_close,
+        .mmap           = sh_wdt_mmap,
 };
 
 static struct watchdog_info sh_wdt_info = {
-        .options                = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+        .options                = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
+                                  WDIOF_MAGICCLOSE,
         .firmware_version       = 1,
         .identity               = "SH WDT",
 };
@@ -371,7 +413,6 @@ static struct miscdevice sh_wdt_miscdev = {
 
 /**
  *      sh_wdt_init - Initialize module
- *
  *      Registers the device and notifier handler. Actual device
  *      initialization is handled by sh_wdt_open().
  */
@@ -381,15 +422,15 @@ static int __init sh_wdt_init(void)
 
         if ((clock_division_ratio < 0x5) || (clock_division_ratio > 0x7)) {
                 clock_division_ratio = WTCSR_CKS_4096;
-                printk(KERN_INFO PFX "clock_division_ratio value must be 0x5<=x<=0x7, using %d\n",
-                        clock_division_ratio);
+                printk(KERN_INFO PFX "clock_division_ratio value must "
+                       "be 0x5<=x<=0x7, using %d\n", clock_division_ratio);
         }
 
-        if (sh_wdt_set_heartbeat(heartbeat))
-        {
+        rc = sh_wdt_set_heartbeat(heartbeat);
+        if (unlikely(rc)) {
                 heartbeat = WATCHDOG_HEARTBEAT;
-                printk(KERN_INFO PFX "heartbeat value must be 1<=x<=3600, using %d\n",
-                        heartbeat);
+                printk(KERN_INFO PFX "heartbeat value must "
+                       "be 1<=x<=3600, using %d\n", heartbeat);
         }
 
         init_timer(&timer);
@@ -397,15 +438,16 @@ static int __init sh_wdt_init(void)
         timer.data = 0;
 
         rc = register_reboot_notifier(&sh_wdt_notifier);
-        if (rc) {
-                printk(KERN_ERR PFX "Can't register reboot notifier (err=%d)\n", rc);
+        if (unlikely(rc)) {
+                printk(KERN_ERR PFX "Can't register reboot notifier (err=%d)\n",
+                       rc);
                 return rc;
         }
 
         rc = misc_register(&sh_wdt_miscdev);
-        if (rc) {
-                printk(KERN_ERR PFX "Can't register miscdev on minor=%d (err=%d)\n",
-                        sh_wdt_miscdev.minor, rc);
+        if (unlikely(rc)) {
+                printk(KERN_ERR PFX "Can't register miscdev on "
+                       "minor=%d (err=%d)\n", sh_wdt_miscdev.minor, rc);
                 unregister_reboot_notifier(&sh_wdt_notifier);
                 return rc;
         }
@@ -418,7 +460,6 @@ static int __init sh_wdt_init(void)
 
 /**
  *      sh_wdt_exit - Deinitialize module
- *
  *      Unregisters the device and notifier handler. Actual device
  *      deinitialization is handled by sh_wdt_close().
  */
@@ -434,14 +475,13 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(clock_division_ratio, int, 0);
-MODULE_PARM_DESC(clock_division_ratio, "Clock division ratio. Valid ranges are from 0x5 (1.31ms) to 0x7 (5.25ms). Defaults to 0x7.");
+MODULE_PARM_DESC(clock_division_ratio, "Clock division ratio. Valid ranges are from 0x5 (1.31ms) to 0x7 (5.25ms). (default=" __MODULE_STRING(clock_division_ratio) ")");
 
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (1<=heartbeat<=3600, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
 
 module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
 module_init(sh_wdt_init);
 module_exit(sh_wdt_exit);
-
diff --git a/drivers/char/watchdog/smsc37b787_wdt.c b/drivers/char/watchdog/smsc37b787_wdt.c
new file mode 100644
index 000000000000..9f56913b484f
--- /dev/null
+++ b/drivers/char/watchdog/smsc37b787_wdt.c
@@ -0,0 +1,627 @@
+/*
+ *      SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
+ *
+ *      Based on acquirewdt.c by Alan Cox <alan@redhat.com>
+ *       and some other existing drivers
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      The authors do NOT admit liability nor provide warranty for
+ *      any of this software. This material is provided "AS-IS" in
+ *      the hope that it may be useful for others.
+ *
+ *      (C) Copyright 2003-2006  Sven Anders <anders@anduras.de>
+ *
+ *  History:
+ *      2003 - Created version 1.0 for Linux 2.4.x.
+ *      2006 - Ported to Linux 2.6, added nowayout and MAGICCLOSE
+ *             features. Released version 1.1
+ *
+ *  Theory of operation:
+ *
+ *      A Watchdog Timer (WDT) is a hardware circuit that can
+ *      reset the computer system in case of a software fault.
+ *      You probably knew that already.
+ *
+ *      Usually a userspace daemon will notify the kernel WDT driver
+ *      via the /dev/watchdog special device file that userspace is
+ *      still alive, at regular intervals.  When such a notification
+ *      occurs, the driver will usually tell the hardware watchdog
+ *      that everything is in order, and that the watchdog should wait
+ *      for yet another little while to reset the system.
+ *      If userspace fails (RAM error, kernel bug, whatever), the
+ *      notifications cease to occur, and the hardware watchdog will
+ *      reset the system (causing a reboot) after the timeout occurs.
+ *
+ * Create device with:
+ *  mknod /dev/watchdog c 10 130
+ *
+ * For an example userspace keep-alive daemon, see:
+ *   Documentation/watchdog/watchdog.txt
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/ioport.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+/* enable support for minutes as units? */
+/* (does not always work correctly, so disabled by default!) */
+#define SMSC_SUPPORT_MINUTES
+#undef SMSC_SUPPORT_MINUTES
+
+#define MAX_TIMEOUT     255
+
+#define UNIT_SECOND     0
+#define UNIT_MINUTE     1
+
+#define MODNAME         "smsc37b787_wdt: "
+#define VERSION         "1.1"
+
+#define IOPORT          0x3F0
+#define IOPORT_SIZE     2
+#define IODEV_NO        8
+
+static int unit = UNIT_SECOND;  /* timer's unit */
+static int timeout = 60;        /* timeout value: default is 60 "units" */
+static unsigned long timer_enabled = 0;   /* is the timer enabled? */
+
+static char expect_close;       /* is the close expected? */
+
+static spinlock_t io_lock;      /* to guard the watchdog from io races */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+
+/* -- Low level function ----------------------------------------*/
+
+/* unlock the IO chip */
+
+static inline void open_io_config(void)
+{
+        outb(0x55, IOPORT);
+        mdelay(1);
+        outb(0x55, IOPORT);
+}
+
+/* lock the IO chip */
+static inline void close_io_config(void)
+{
+        outb(0xAA, IOPORT);
+}
+
+/* select the IO device */
+static inline void select_io_device(unsigned char devno)
+{
+        outb(0x07, IOPORT);
+        outb(devno, IOPORT+1);
+}
+
+/* write to the control register */
+static inline void write_io_cr(unsigned char reg, unsigned char data)
+{
+        outb(reg, IOPORT);
+        outb(data, IOPORT+1);
+}
+
+/* read from the control register */
+static inline char read_io_cr(unsigned char reg)
+{
+        outb(reg, IOPORT);
+        return inb(IOPORT+1);
+}
+
+/* -- Medium level functions ------------------------------------*/
+
+static inline void gpio_bit12(unsigned char reg)
+{
+        // -- General Purpose I/O Bit 1.2 --
+        // Bit 0,   In/Out: 0 = Output, 1 = Input
+        // Bit 1,   Polarity: 0 = No Invert, 1 = Invert
+        // Bit 2,   Group Enable Intr.: 0 = Disable, 1 = Enable
+        // Bit 3/4, Function select: 00 = GPI/O, 01 = WDT, 10 = P17,
+        //                           11 = Either Edge Triggered Intr. 2
+        // Bit 5/6  (Reserved)
+        // Bit 7,   Output Type: 0 = Push Pull Bit, 1 = Open Drain
+        write_io_cr(0xE2, reg);
+}
+
+static inline void gpio_bit13(unsigned char reg)
+{
+        // -- General Purpose I/O Bit 1.3 --
+        // Bit 0,  In/Out: 0 = Output, 1 = Input
+        // Bit 1,  Polarity: 0 = No Invert, 1 = Invert
+        // Bit 2,  Group Enable Intr.: 0 = Disable, 1 = Enable
+        // Bit 3,  Function select: 0 = GPI/O, 1 = LED
+        // Bit 4-6 (Reserved)
+        // Bit 7,  Output Type: 0 = Push Pull Bit, 1 = Open Drain
+        write_io_cr(0xE3, reg);
+}
+
+static inline void wdt_timer_units(unsigned char new_units)
+{
+        // -- Watchdog timer units --
+        // Bit 0-6 (Reserved)
+        // Bit 7,  WDT Time-out Value Units Select
+        //         (0 = Minutes, 1 = Seconds)
+        write_io_cr(0xF1, new_units);
+}
+
+static inline void wdt_timeout_value(unsigned char new_timeout)
+{
+        // -- Watchdog Timer Time-out Value --
+        // Bit 0-7 Binary coded units (0=Disabled, 1..255)
+        write_io_cr(0xF2, new_timeout);
+}
+
+static inline void wdt_timer_conf(unsigned char conf)
+{
+        // -- Watchdog timer configuration --
+        // Bit 0   Joystick enable: 0* = No Reset, 1 = Reset WDT upon Gameport I/O
+        // Bit 1   Keyboard enable: 0* = No Reset, 1 = Reset WDT upon KBD Intr.
+        // Bit 2   Mouse enable: 0* = No Reset, 1 = Reset WDT upon Mouse Intr.
+        // Bit 3   Reset the timer
+        //         (Wrong in SMsC documentation? Given as: PowerLED Timout Enabled)
+        // Bit 4-7 WDT Interrupt Mapping: (0000* = Disabled,
+        //            0001=IRQ1, 0010=(Invalid), 0011=IRQ3 to 1111=IRQ15)
+        write_io_cr(0xF3, conf);
+}
+
+static inline void wdt_timer_ctrl(unsigned char reg)
+{
+        // -- Watchdog timer control --
+        // Bit 0   Status Bit: 0 = Timer counting, 1 = Timeout occured
+        // Bit 1   Power LED Toggle: 0 = Disable Toggle, 1 = Toggle at 1 Hz
+        // Bit 2   Force Timeout: 1 = Forces WD timeout event (self-cleaning)
+        // Bit 3   P20 Force Timeout enabled:
+        //          0 = P20 activity does not generate the WD timeout event
+        //          1 = P20 Allows rising edge of P20, from the keyboard
+        //              controller, to force the WD timeout event.
+        // Bit 4   (Reserved)
+        // -- Soft power management --
+        // Bit 5   Stop Counter: 1 = Stop software power down counter
+        //            set via register 0xB8, (self-cleaning)
+        //            (Upon read: 0 = Counter running, 1 = Counter stopped)
+        // Bit 6   Restart Counter: 1 = Restart software power down counter
+        //            set via register 0xB8, (self-cleaning)
+        // Bit 7   SPOFF: 1 = Force software power down (self-cleaning)
+
+        write_io_cr(0xF4, reg);
+}
+
+/* -- Higher level functions ------------------------------------*/
+
+/* initialize watchdog */
+
+static void wb_smsc_wdt_initialize(void)
+{
+        unsigned char old;
+
+        spin_lock(&io_lock);
+        open_io_config();
+        select_io_device(IODEV_NO);
+
+        // enable the watchdog
+        gpio_bit13(0x08);  // Select pin 80 = LED not GPIO
+        gpio_bit12(0x0A);  // Set pin 79 = WDT not GPIO/Output/Polarity=Invert
+
+        // disable the timeout
+        wdt_timeout_value(0);
+
+        // reset control register
+        wdt_timer_ctrl(0x00);
+
+        // reset configuration register
+        wdt_timer_conf(0x00);
+
+        // read old (timer units) register
+        old = read_io_cr(0xF1) & 0x7F;
+        if (unit == UNIT_SECOND) old |= 0x80; // set to seconds
+
+        // set the watchdog timer units
+        wdt_timer_units(old);
+
+        close_io_config();
+        spin_unlock(&io_lock);
+}
+
+/* shutdown the watchdog */
+
+static void wb_smsc_wdt_shutdown(void)
+{
+        spin_lock(&io_lock);
+        open_io_config();
+        select_io_device(IODEV_NO);
+
+        // disable the watchdog
+        gpio_bit13(0x09);
+        gpio_bit12(0x09);
+
+        // reset watchdog config register
+        wdt_timer_conf(0x00);
+
+        // reset watchdog control register
+        wdt_timer_ctrl(0x00);
+
+        // disable timeout
+        wdt_timeout_value(0x00);
+
+        close_io_config();
+        spin_unlock(&io_lock);
+}
+
+/* set timeout => enable watchdog */
+
+static void wb_smsc_wdt_set_timeout(unsigned char new_timeout)
+{
+        spin_lock(&io_lock);
+        open_io_config();
+        select_io_device(IODEV_NO);
+
+        // set Power LED to blink, if we enable the timeout
+        wdt_timer_ctrl((new_timeout == 0) ? 0x00 : 0x02);
+
+        // set timeout value
+        wdt_timeout_value(new_timeout);
+
+        close_io_config();
+        spin_unlock(&io_lock);
+}
+
+/* get timeout */
+
+static unsigned char wb_smsc_wdt_get_timeout(void)
+{
+        unsigned char set_timeout;
+
+        spin_lock(&io_lock);
+        open_io_config();
+        select_io_device(IODEV_NO);
+        set_timeout = read_io_cr(0xF2);
+        close_io_config();
+        spin_unlock(&io_lock);
+
+        return set_timeout;
+}
+
+/* disable watchdog */
+
+static void wb_smsc_wdt_disable(void)
+{
+        // set the timeout to 0 to disable the watchdog
+        wb_smsc_wdt_set_timeout(0);
+}
+
+/* enable watchdog by setting the current timeout */
+
+static void wb_smsc_wdt_enable(void)
+{
+        // set the current timeout...
+        wb_smsc_wdt_set_timeout(timeout);
+}
+
+/* reset the timer */
+
+static void wb_smsc_wdt_reset_timer(void)
+{
+        spin_lock(&io_lock);
+        open_io_config();
+        select_io_device(IODEV_NO);
+
+        // reset the timer
+        wdt_timeout_value(timeout);
+        wdt_timer_conf(0x08);
+
+        close_io_config();
+        spin_unlock(&io_lock);
+}
+
+/* return, if the watchdog is enabled (timeout is set...) */
+
+static int wb_smsc_wdt_status(void)
+{
+        return (wb_smsc_wdt_get_timeout() == 0) ? 0 : WDIOF_KEEPALIVEPING;
+}
+
+
+/* -- File operations -------------------------------------------*/
+
+/* open => enable watchdog and set initial timeout */
+
+static int wb_smsc_wdt_open(struct inode *inode, struct file *file)
+{
+        /* /dev/watchdog can only be opened once */
+
+        if (test_and_set_bit(0, &timer_enabled))
+                return -EBUSY;
+
+        if (nowayout)
+                __module_get(THIS_MODULE);
+
+        /* Reload and activate timer */
+        wb_smsc_wdt_enable();
+
+        printk(KERN_INFO MODNAME "Watchdog enabled. Timeout set to %d %s.\n", timeout, (unit == UNIT_SECOND) ? "second(s)" : "minute(s)");
+
+        return nonseekable_open(inode, file);
+}
+
+/* close => shut off the timer */
+
+static int wb_smsc_wdt_release(struct inode *inode, struct file *file)
+{
+        /* Shut off the timer. */
+
+        if (expect_close == 42) {
+                wb_smsc_wdt_disable();
+                printk(KERN_INFO MODNAME "Watchdog disabled, sleeping again...\n");
+        } else {
+                printk(KERN_CRIT MODNAME "Unexpected close, not stopping watchdog!\n");
+                wb_smsc_wdt_reset_timer();
+        }
+
+        clear_bit(0, &timer_enabled);
+        expect_close = 0;
+        return 0;
+}
+
+/* write => update the timer to keep the machine alive */
+
+static ssize_t wb_smsc_wdt_write(struct file *file, const char __user *data,
+                                 size_t len, loff_t *ppos)
+{
+        /* See if we got the magic character 'V' and reload the timer */
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* reset expect flag */
+                        expect_close = 0;
+
+                        /* scan to see whether or not we got the magic character */
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data+i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 42;
+                        }
+                }
+
+                /* someone wrote to us, we should reload the timer */
+                wb_smsc_wdt_reset_timer();
+        }
+        return len;
+}
+
+/* ioctl => control interface */
+
+static int wb_smsc_wdt_ioctl(struct inode *inode, struct file *file,
+                             unsigned int cmd, unsigned long arg)
+{
+        int new_timeout;
+
+        union {
+                struct watchdog_info __user *ident;
+                int __user *i;
+        } uarg;
+
+        static struct watchdog_info ident = {
+                .options =              WDIOF_KEEPALIVEPING |
+                                        WDIOF_SETTIMEOUT |
+                                        WDIOF_MAGICCLOSE,
+                .firmware_version =     0,
+                .identity =             "SMsC 37B787 Watchdog"
+        };
+
+        uarg.i = (int __user *)arg;
+
+        switch (cmd) {
+                default:
+                        return -ENOTTY;
+
+                case WDIOC_GETSUPPORT:
+                        return copy_to_user(uarg.ident, &ident,
+                                sizeof(ident)) ? -EFAULT : 0;
+
+                case WDIOC_GETSTATUS:
+                        return put_user(wb_smsc_wdt_status(), uarg.i);
+
+                case WDIOC_GETBOOTSTATUS:
+                        return put_user(0, uarg.i);
+
+                case WDIOC_KEEPALIVE:
+                        wb_smsc_wdt_reset_timer();
+                        return 0;
+
+                case WDIOC_SETTIMEOUT:
+                        if (get_user(new_timeout, uarg.i))
+                                return -EFAULT;
+
+                        // the API states this is given in secs
+                        if (unit == UNIT_MINUTE)
+                          new_timeout /= 60;
+
+                        if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)
+                                return -EINVAL;
+
+                        timeout = new_timeout;
+                        wb_smsc_wdt_set_timeout(timeout);
+
+                        // fall through and return the new timeout...
+
+                case WDIOC_GETTIMEOUT:
+
+                        new_timeout = timeout;
+
+                        if (unit == UNIT_MINUTE)
+                          new_timeout *= 60;
+
+                        return put_user(new_timeout, uarg.i);
+
+                case WDIOC_SETOPTIONS:
+                {
+                        int options, retval = -EINVAL;
+
+                        if (get_user(options, uarg.i))
+                                return -EFAULT;
+
+                        if (options & WDIOS_DISABLECARD) {
+                                wb_smsc_wdt_disable();
+                                retval = 0;
+                        }
+
+                        if (options & WDIOS_ENABLECARD) {
+                                wb_smsc_wdt_enable();
+                                retval = 0;
+                        }
+
+                        return retval;
+                }
+        }
+}
+
+/* -- Notifier funtions -----------------------------------------*/
+
+static int wb_smsc_wdt_notify_sys(struct notifier_block *this, unsigned long code, void *unused)
+{
+        if (code == SYS_DOWN || code == SYS_HALT)
+        {
+                // set timeout to 0, to avoid possible race-condition
+                timeout = 0;
+                wb_smsc_wdt_disable();
+        }
+        return NOTIFY_DONE;
+}
+
+/* -- Module's structures ---------------------------------------*/
+
+static struct file_operations wb_smsc_wdt_fops =
+{
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = wb_smsc_wdt_write,
+        .ioctl          = wb_smsc_wdt_ioctl,
+        .open           = wb_smsc_wdt_open,
+        .release        = wb_smsc_wdt_release,
+};
+
+static struct notifier_block wb_smsc_wdt_notifier =
+{
+        .notifier_call  = wb_smsc_wdt_notify_sys,
+};
+
+static struct miscdevice wb_smsc_wdt_miscdev =
+{
+        .minor          = WATCHDOG_MINOR,
+        .name           = "watchdog",
+        .fops           = &wb_smsc_wdt_fops,
+};
+
+/* -- Module init functions -------------------------------------*/
+
+/* module's "constructor" */
+
+static int __init wb_smsc_wdt_init(void)
+{
+        int ret;
+
+        spin_lock_init(&io_lock);
+
+        printk("SMsC 37B787 watchdog component driver " VERSION " initialising...\n");
+
+        if (!request_region(IOPORT, IOPORT_SIZE, "SMsC 37B787 watchdog")) {
+                printk(KERN_ERR MODNAME "Unable to register IO port %#x\n", IOPORT);
+                ret = -EBUSY;
+                goto out_pnp;
+        }
+
+        // set new maximum, if it's too big
+        if (timeout > MAX_TIMEOUT)
+               timeout = MAX_TIMEOUT;
+
+        // init the watchdog timer
+        wb_smsc_wdt_initialize();
+
+        ret = register_reboot_notifier(&wb_smsc_wdt_notifier);
+        if (ret) {
+                printk(KERN_ERR MODNAME "Unable to register reboot notifier err = %d\n", ret);
+                goto out_io;
+        }
+
+        ret = misc_register(&wb_smsc_wdt_miscdev);
+        if (ret) {
+                printk(KERN_ERR MODNAME "Unable to register miscdev on minor %d\n", WATCHDOG_MINOR);
+                goto out_rbt;
+        }
+
+        // output info
+        printk(KERN_INFO MODNAME "Timeout set to %d %s.\n", timeout, (unit == UNIT_SECOND) ? "second(s)" : "minute(s)");
+        printk(KERN_INFO MODNAME "Watchdog initialized and sleeping (nowayout=%d)...\n", nowayout);
+
+        // ret = 0
+
+out_clean:
+        return ret;
+
+out_rbt:
+        unregister_reboot_notifier(&wb_smsc_wdt_notifier);
+
+out_io:
+        release_region(IOPORT, IOPORT_SIZE);
+
+out_pnp:
+        goto out_clean;
+}
+
+/* module's "destructor" */
+
+static void __exit wb_smsc_wdt_exit(void)
+{
+        /* Stop the timer before we leave */
+        if (!nowayout)
+        {
+                wb_smsc_wdt_shutdown();
+                printk(KERN_INFO MODNAME "Watchdog disabled.\n");
+        }
+
+        misc_deregister(&wb_smsc_wdt_miscdev);
+        unregister_reboot_notifier(&wb_smsc_wdt_notifier);
+        release_region(IOPORT, IOPORT_SIZE);
+
+        printk("SMsC 37B787 watchdog component driver removed.\n");
+}
+
+module_init(wb_smsc_wdt_init);
+module_exit(wb_smsc_wdt_exit);
+
+MODULE_AUTHOR("Sven Anders <anders@anduras.de>");
+MODULE_DESCRIPTION("Driver for SMsC 37B787 watchdog component (Version " VERSION ")");
+MODULE_LICENSE("GPL");
+
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
+#ifdef SMSC_SUPPORT_MINUTES
+module_param(unit, int, 0);
+MODULE_PARM_DESC(unit, "set unit to use, 0=seconds or 1=minutes, default is 0");
+#endif
+
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60");
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index ef8da517545a..4067e1f8a368 100644
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -203,7 +203,7 @@ static int softdog_ioctl(struct inode *inode, struct file *file,
         };
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident,
                                 sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index 13f16d41c2fd..07d4bff27226 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -33,6 +33,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/spinlock.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -44,6 +45,7 @@
 
 static unsigned long wdt_is_open;
 static char expect_close;
+static spinlock_t io_lock;
 
 /* You must set this - there is no sane way to probe for this board. */
 static int wdt_io = 0x2E;
@@ -110,12 +112,16 @@ w83627hf_init(void)
 static void
 wdt_ctrl(int timeout)
 {
+        spin_lock(&io_lock);
+        
         w83627hf_select_wd_register();
 
         outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
         outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF6 */
 
         w83627hf_unselect_wd_register();
+
+        spin_unlock(&io_lock);
 }
 
 static int
@@ -223,7 +229,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
@@ -303,6 +309,8 @@ wdt_init(void)
 {
         int ret;
 
+        spin_lock_init(&io_lock);
+
         printk(KERN_INFO "WDT driver for the Winbond(TM) W83627HF Super I/O chip initialising.\n");
 
         if (wdt_set_heartbeat(timeout)) {
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
new file mode 100644
index 000000000000..7768b55487c8
--- /dev/null
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -0,0 +1,450 @@
+/*
+ *      w83697hf/hg WDT driver
+ *
+ *      (c) Copyright 2006 Samuel Tardieu <sam@rfc1149.net>
+ *      (c) Copyright 2006 Marcus Junker <junker@anduras.de>
+ *
+ *      Based on w83627hf_wdt.c which is based on advantechwdt.c
+ *      which is based on wdt.c.
+ *      Original copyright messages:
+ *
+ *      (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
+ *
+ *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
+ *
+ *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *                              http://www.redhat.com
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      Neither Marcus Junker nor ANDURAS AG admit liability nor provide
+ *      warranty for any of this software. This material is provided
+ *      "AS-IS" and at no charge.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/fs.h>
+#include <linux/ioport.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+#define WATCHDOG_NAME "w83697hf/hg WDT"
+#define PFX WATCHDOG_NAME ": "
+#define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
+
+static unsigned long wdt_is_open;
+static char expect_close;
+static spinlock_t io_lock;
+
+/* You must set this - there is no sane way to probe for this board. */
+static int wdt_io = 0x2e;
+module_param(wdt_io, int, 0);
+MODULE_PARM_DESC(wdt_io, "w83697hf/hg WDT io port (default 0x2e, 0 = autodetect)");
+
+static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
+/*
+ *      Kernel methods.
+ */
+
+#define W83697HF_EFER (wdt_io+0)        /* Extended Function Enable Register */
+#define W83697HF_EFIR (wdt_io+0)        /* Extended Function Index Register (same as EFER) */
+#define W83697HF_EFDR (wdt_io+1)        /* Extended Function Data Register */
+
+static inline void
+w83697hf_unlock(void)
+{
+        outb_p(0x87, W83697HF_EFER);    /* Enter extended function mode */
+        outb_p(0x87, W83697HF_EFER);    /* Again according to manual */
+}
+
+static inline void
+w83697hf_lock(void)
+{
+        outb_p(0xAA, W83697HF_EFER);    /* Leave extended function mode */
+}
+
+/*
+ *      The three functions w83697hf_get_reg(), w83697hf_set_reg() and
+ *      w83697hf_write_timeout() must be called with the device unlocked.
+ */
+
+static unsigned char
+w83697hf_get_reg(unsigned char reg)
+{
+        outb_p(reg, W83697HF_EFIR);
+        return inb_p(W83697HF_EFDR);
+}
+
+static void
+w83697hf_set_reg(unsigned char reg, unsigned char data)
+{
+        outb_p(reg, W83697HF_EFIR);
+        outb_p(data, W83697HF_EFDR);
+}
+
+static void
+w83697hf_write_timeout(int timeout)
+{
+        w83697hf_set_reg(0xF4, timeout);        /* Write Timeout counter to CRF4 */
+}
+
+static void
+w83697hf_select_wdt(void)
+{
+        w83697hf_unlock();
+        w83697hf_set_reg(0x07, 0x08);   /* Switch to logic device 8 (GPIO2) */
+}
+
+static inline void
+w83697hf_deselect_wdt(void)
+{
+        w83697hf_lock();
+}
+
+static void
+w83697hf_init(void)
+{
+        unsigned char bbuf;
+
+        w83697hf_select_wdt();
+
+        bbuf = w83697hf_get_reg(0x29);
+        bbuf &= ~0x60;
+        bbuf |= 0x20;
+        w83697hf_set_reg(0x29, bbuf);   /* Set pin 119 to WDTO# mode (= CR29, WDT0) */
+
+        bbuf = w83697hf_get_reg(0xF3);
+        bbuf &= ~0x04;
+        w83697hf_set_reg(0xF3, bbuf);   /* Count mode is seconds */
+
+        w83697hf_deselect_wdt();
+}
+
+static int
+wdt_ping(void)
+{
+        spin_lock(&io_lock);
+        w83697hf_select_wdt();
+
+        w83697hf_write_timeout(timeout);
+
+        w83697hf_deselect_wdt();
+        spin_unlock(&io_lock);
+        return 0;
+}
+
+static int
+wdt_enable(void)
+{
+        spin_lock(&io_lock);
+        w83697hf_select_wdt();
+
+        w83697hf_write_timeout(timeout);
+        w83697hf_set_reg(0x30, 1);      /* Enable timer */
+
+        w83697hf_deselect_wdt();
+        spin_unlock(&io_lock);
+        return 0;
+}
+
+static int
+wdt_disable(void)
+{
+        spin_lock(&io_lock);
+        w83697hf_select_wdt();
+
+        w83697hf_set_reg(0x30, 0);      /* Disable timer */
+        w83697hf_write_timeout(0);
+
+        w83697hf_deselect_wdt();
+        spin_unlock(&io_lock);
+        return 0;
+}
+
+static int
+wdt_set_heartbeat(int t)
+{
+        if ((t < 1) || (t > 255))
+                return -EINVAL;
+
+        timeout = t;
+        return 0;
+}
+
+static ssize_t
+wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+{
+        if (count) {
+                if (!nowayout) {
+                        size_t i;
+
+                        expect_close = 0;
+
+                        for (i = 0; i != count; i++) {
+                                char c;
+                                if (get_user(c, buf+i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 42;
+                        }
+                }
+                wdt_ping();
+        }
+        return count;
+}
+
+static int
+wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+          unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
+        int new_timeout;
+        static struct watchdog_info ident = {
+                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+                .firmware_version = 1,
+                .identity = "W83697HF WDT",
+        };
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
+
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0, p);
+
+        case WDIOC_KEEPALIVE:
+                wdt_ping();
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_timeout, p))
+                        return -EFAULT;
+                if (wdt_set_heartbeat(new_timeout))
+                        return -EINVAL;
+                wdt_ping();
+                /* Fall */
+
+        case WDIOC_GETTIMEOUT:
+                return put_user(timeout, p);
+
+        case WDIOC_SETOPTIONS:
+        {
+                int options, retval = -EINVAL;
+
+                if (get_user(options, p))
+                        return -EFAULT;
+
+                if (options & WDIOS_DISABLECARD) {
+                        wdt_disable();
+                        retval = 0;
+                }
+
+                if (options & WDIOS_ENABLECARD) {
+                        wdt_enable();
+                        retval = 0;
+                }
+
+                return retval;
+        }
+
+        default:
+                return -ENOTTY;
+        }
+        return 0;
+}
+
+static int
+wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &wdt_is_open))
+                return -EBUSY;
+        /*
+         *      Activate
+         */
+
+        wdt_enable();
+        return nonseekable_open(inode, file);
+}
+
+static int
+wdt_close(struct inode *inode, struct file *file)
+{
+        if (expect_close == 42) {
+                wdt_disable();
+        } else {
+                printk (KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                wdt_ping();
+        }
+        expect_close = 0;
+        clear_bit(0, &wdt_is_open);
+        return 0;
+}
+
+/*
+ *      Notifier for system down
+ */
+
+static int
+wdt_notify_sys(struct notifier_block *this, unsigned long code,
+        void *unused)
+{
+        if (code == SYS_DOWN || code == SYS_HALT) {
+                /* Turn the WDT off */
+                wdt_disable();
+        }
+        return NOTIFY_DONE;
+}
+
+/*
+ *      Kernel Interfaces
+ */
+
+static struct file_operations wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = wdt_write,
+        .ioctl          = wdt_ioctl,
+        .open           = wdt_open,
+        .release        = wdt_close,
+};
+
+static struct miscdevice wdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &wdt_fops,
+};
+
+/*
+ *      The WDT needs to learn about soft shutdowns in order to
+ *      turn the timebomb registers off.
+ */
+
+static struct notifier_block wdt_notifier = {
+        .notifier_call = wdt_notify_sys,
+};
+
+static int
+w83697hf_check_wdt(void)
+{
+        if (!request_region(wdt_io, 2, WATCHDOG_NAME)) {
+                printk (KERN_ERR PFX "I/O address 0x%x already in use\n", wdt_io);
+                return -EIO;
+        }
+
+        printk (KERN_DEBUG PFX "Looking for watchdog at address 0x%x\n", wdt_io);
+        w83697hf_unlock();
+        if (w83697hf_get_reg(0x20) == 0x60) {
+                printk (KERN_INFO PFX "watchdog found at address 0x%x\n", wdt_io);
+                w83697hf_lock();
+                return 0;
+        }
+        w83697hf_lock();        /* Reprotect in case it was a compatible device */
+
+        printk (KERN_INFO PFX "watchdog not found at address 0x%x\n", wdt_io);
+        release_region(wdt_io, 2);
+        return -EIO;
+}
+
+static int w83697hf_ioports[] = { 0x2e, 0x4e, 0x00 };
+
+static int __init
+wdt_init(void)
+{
+        int ret, i, found = 0;
+
+        spin_lock_init(&io_lock);
+
+        printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n");
+
+        if (wdt_io == 0) {
+                /* we will autodetect the W83697HF/HG watchdog */
+                for (i = 0; ((!found) && (w83697hf_ioports[i] != 0)); i++) {
+                        wdt_io = w83697hf_ioports[i];
+                        if (!w83697hf_check_wdt())
+                                found++;
+                }
+        } else {
+                if (!w83697hf_check_wdt())
+                        found++;
+        }
+
+        if (!found) {
+                printk (KERN_ERR PFX "No W83697HF/HG could be found\n");
+                ret = -EIO;
+                goto out;
+        }
+
+        w83697hf_init();
+        wdt_disable();  /* Disable watchdog until first use */
+
+        if (wdt_set_heartbeat(timeout)) {
+                wdt_set_heartbeat(WATCHDOG_TIMEOUT);
+                printk (KERN_INFO PFX "timeout value must be 1<=timeout<=255, using %d\n",
+                        WATCHDOG_TIMEOUT);
+        }
+
+        ret = register_reboot_notifier(&wdt_notifier);
+        if (ret != 0) {
+                printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
+                        ret);
+                goto unreg_regions;
+        }
+
+        ret = misc_register(&wdt_miscdev);
+        if (ret != 0) {
+                printk (KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+                        WATCHDOG_MINOR, ret);
+                goto unreg_reboot;
+        }
+
+        printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
+                timeout, nowayout);
+
+out:
+        return ret;
+unreg_reboot:
+        unregister_reboot_notifier(&wdt_notifier);
+unreg_regions:
+        release_region(wdt_io, 2);
+        goto out;
+}
+
+static void __exit
+wdt_exit(void)
+{
+        misc_deregister(&wdt_miscdev);
+        unregister_reboot_notifier(&wdt_notifier);
+        release_region(wdt_io, 2);
+}
+
+module_init(wdt_init);
+module_exit(wdt_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, Samuel Tardieu <sam@rfc1149.net>");
+MODULE_DESCRIPTION("w83697hf/hg WDT driver");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c
index ccf6c0915945..b0e5f84d6baf 100644
--- a/drivers/char/watchdog/w83877f_wdt.c
+++ b/drivers/char/watchdog/w83877f_wdt.c
@@ -252,7 +252,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/w83977f_wdt.c b/drivers/char/watchdog/w83977f_wdt.c
index 98f4e17db70a..2c8d5d8bd4e8 100644
--- a/drivers/char/watchdog/w83977f_wdt.c
+++ b/drivers/char/watchdog/w83977f_wdt.c
@@ -393,7 +393,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file,
         switch(cmd)
         {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(uarg.ident, &ident, sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/wafer5823wdt.c b/drivers/char/watchdog/wafer5823wdt.c
index 2bb6a9d6ad28..163e028ef9ed 100644
--- a/drivers/char/watchdog/wafer5823wdt.c
+++ b/drivers/char/watchdog/wafer5823wdt.c
@@ -174,7 +174,7 @@ static int wafwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd
         }
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c
index 5c38cdf41731..1d64e277567d 100644
--- a/drivers/char/watchdog/wdrtas.c
+++ b/drivers/char/watchdog/wdrtas.c
@@ -385,7 +385,7 @@ wdrtas_ioctl(struct inode *inode, struct file *file,
                 return put_user(wdrtas_interval, argp);
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 70be81e39a61..517fbd8643f8 100644
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -225,14 +225,13 @@ static int wdt_get_temperature(int *temperature)
  *      wdt_interrupt:
  *      @irq:           Interrupt number
  *      @dev_id:        Unused as we don't allow multiple devices.
- *      @regs:          Unused.
  *
  *      Handle an interrupt from the board. These are raised when the status
  *      map changes in what the board considers an interesting way. That means
  *      a failure condition occurring.
  */
 
-static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t wdt_interrupt(int irq, void *dev_id)
 {
         /*
          *      Read the status register see what is up and
@@ -341,7 +340,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
 
diff --git a/drivers/char/watchdog/wdt285.c b/drivers/char/watchdog/wdt285.c
index 6555fb844f23..e4cf661dc890 100644
--- a/drivers/char/watchdog/wdt285.c
+++ b/drivers/char/watchdog/wdt285.c
@@ -46,7 +46,7 @@ static unsigned long timer_alive;
 /*
  *      If the timer expires..
  */
-static void watchdog_fire(int irq, void *dev_id, struct pt_regs *regs)
+static void watchdog_fire(int irq, void *dev_id)
 {
         printk(KERN_CRIT "Watchdog: Would Reboot.\n");
         *CSR_TIMER4_CNTL = 0;
@@ -137,7 +137,7 @@ watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                unsigned long arg)
 {
         unsigned int new_margin;
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
 
         switch(cmd) {
         case WDIOC_GETSUPPORT:
diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c
index a0935bc775f8..6253041b235b 100644
--- a/drivers/char/watchdog/wdt977.c
+++ b/drivers/char/watchdog/wdt977.c
@@ -361,7 +361,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file,
         switch(cmd)
         {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(uarg.ident, &ident,
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
index 5918ca2c9c35..ce1261c5cbce 100644
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -270,14 +270,13 @@ static int wdtpci_get_temperature(int *temperature)
  *      wdtpci_interrupt:
  *      @irq:           Interrupt number
  *      @dev_id:        Unused as we don't allow multiple devices.
- *      @regs:          Unused.
  *
  *      Handle an interrupt from the board. These are raised when the status
  *      map changes in what the board considers an interesting way. That means
  *      a failure condition occurring.
  */
 
-static irqreturn_t wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
 {
         /*
          *      Read the status register see what is up and
@@ -386,7 +385,7 @@ static int wdtpci_ioctl(struct inode *inode, struct file *file, unsigned int cmd
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;