http://linux-watchdog.bkbits.net/linux-2.6-watchdog-mm
olh@suse.de|ChangeSet|20050128222454|38554 olh

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/28 23:24:54+01:00 olh@suse.de 
#   [WATCHDOG] correct sysfs name for watchdog devices
#   
#   While looking for possible candidates for our udev.rules package,
#   I found a few odd ->name properties. /dev/watchdog has minor 130
#   according to devices.txt. Since all watchdog drivers use the
#   misc_register() call, they will end up in /sys/class/misc/$foo.
#   udev may create the /dev/watchdog node if the driver is loaded.
#   I dont have such a device, so I cant test it.
#   The drivers below provide names with spaces and even with / in it.
#   Not a big deal, but apps may expect /dev/watchdog.
#   
#   Signed-off-by: Olaf Hering <olh@suse.de>
#   Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
# 
# drivers/char/watchdog/scx200_wdt.c
#   2005/01/28 23:24:45+01:00 olh@suse.de +1 -1
#   While looking for possible candidates for our udev.rules package,
#   I found a few odd ->name properties. /dev/watchdog has minor 130
#   according to devices.txt. Since all watchdog drivers use the
#   misc_register() call, they will end up in /sys/class/misc/$foo.
#   udev may create the /dev/watchdog node if the driver is loaded.
#   I dont have such a device, so I cant test it.
#   The drivers below provide names with spaces and even with / in it.
#   Not a big deal, but apps may expect /dev/watchdog.
#   
#   Signed-off-by: Olaf Hering <olh@suse.de>
#   Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
# 
# drivers/char/watchdog/sa1100_wdt.c
#   2005/01/28 23:24:45+01:00 olh@suse.de +1 -1
#   While looking for possible candidates for our udev.rules package,
#   I found a few odd ->name properties. /dev/watchdog has minor 130
#   according to devices.txt. Since all watchdog drivers use the
#   misc_register() call, they will end up in /sys/class/misc/$foo.
#   udev may create the /dev/watchdog node if the driver is loaded.
#   I dont have such a device, so I cant test it.
#   The drivers below provide names with spaces and even with / in it.
#   Not a big deal, but apps may expect /dev/watchdog.
#   
#   Signed-off-by: Olaf Hering <olh@suse.de>
#   Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
# 
# drivers/char/watchdog/ixp4xx_wdt.c
#   2005/01/28 23:24:45+01:00 olh@suse.de +1 -1
#   While looking for possible candidates for our udev.rules package,
#   I found a few odd ->name properties. /dev/watchdog has minor 130
#   according to devices.txt. Since all watchdog drivers use the
#   misc_register() call, they will end up in /sys/class/misc/$foo.
#   udev may create the /dev/watchdog node if the driver is loaded.
#   I dont have such a device, so I cant test it.
#   The drivers below provide names with spaces and even with / in it.
#   Not a big deal, but apps may expect /dev/watchdog.
#   
#   Signed-off-by: Olaf Hering <olh@suse.de>
#   Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
# 
# drivers/char/watchdog/ixp2000_wdt.c
#   2005/01/28 23:24:45+01:00 olh@suse.de +1 -1
#   While looking for possible candidates for our udev.rules package,
#   I found a few odd ->name properties. /dev/watchdog has minor 130
#   according to devices.txt. Since all watchdog drivers use the
#   misc_register() call, they will end up in /sys/class/misc/$foo.
#   udev may create the /dev/watchdog node if the driver is loaded.
#   I dont have such a device, so I cant test it.
#   The drivers below provide names with spaces and even with / in it.
#   Not a big deal, but apps may expect /dev/watchdog.
#   
#   Signed-off-by: Olaf Hering <olh@suse.de>
#   Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
# 
# ChangeSet
#   2005/01/28 22:38:30+01:00 wim@iguana.be 
#   [WATCHDOG] i8xx_tco.c-ICH4/6/7-patch
#   
#   Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
#   chipsets. Also added support for the "undocumented" ICH7.
# 
# drivers/char/watchdog/i8xx_tco.c
#   2005/01/28 22:38:21+01:00 wim@iguana.be +27 -7
#   Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
#   chipsets. Also added support for the "undocumented" ICH7.
# 
diff -Nru a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
--- a/drivers/char/watchdog/i8xx_tco.c	2005-01-28 14:50:17 -08:00
+++ b/drivers/char/watchdog/i8xx_tco.c	2005-01-28 14:50:17 -08:00
@@ -1,5 +1,5 @@
 /*
- *	i8xx_tco 0.06:	TCO timer driver for i8xx chipsets
+ *	i8xx_tco 0.07:	TCO timer driver for i8xx chipsets
  *
  *	(c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
  *				http://www.kernelconcepts.de
@@ -22,11 +22,22 @@
  *
  *	The TCO timer is implemented in the following I/O controller hubs:
  *	(See the intel documentation on http://developer.intel.com.)
- *	82801AA & 82801AB  chip : document number 290655-003, 290677-004,
- *	82801BA & 82801BAM chip : document number 290687-002, 298242-005,
- *	82801CA & 82801CAM chip : document number 290716-001, 290718-001,
- *	82801DB & 82801E   chip : document number 290744-001, 273599-001,
- *	82801EB & 82801ER  chip : document number 252516-001
+ *	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
  *
  *  20000710 Nils Faerber
  *	Initial Version 0.01
@@ -49,6 +60,9 @@
  *  20030921 Wim Van Sebroeck <wim@iguana.be>
  *	0.06 change i810_margin to heartbeat, use module_param,
  *	     added notify system support, renamed module to i8xx_tco.
+ *  20050128 Wim Van Sebroeck <wim@iguana.be>
+ *	0.07 Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
+ *	     chipsets. Also added support for the "undocumented" ICH7 chipset.
  */
 
 /*
@@ -73,7 +87,7 @@
 #include "i8xx_tco.h"
 
 /* Module and version information */
-#define TCO_VERSION "0.06"
+#define TCO_VERSION "0.07"
 #define TCO_MODULE_NAME "i8xx TCO timer"
 #define TCO_DRIVER_NAME   TCO_MODULE_NAME ", v" TCO_VERSION
 #define PFX TCO_MODULE_NAME ": "
@@ -360,8 +374,14 @@
 	{ 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_ICH6_0,	PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,	PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2,	PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,	PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,	PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
 };
 MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
diff -Nru a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
--- a/drivers/char/watchdog/ixp2000_wdt.c	2005-01-28 14:50:17 -08:00
+++ b/drivers/char/watchdog/ixp2000_wdt.c	2005-01-28 14:50:17 -08:00
@@ -186,7 +186,7 @@
 static struct miscdevice ixp2000_wdt_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "IXP2000 Watchdog",
+	.name		= "watchdog",
 	.fops		= &ixp2000_wdt_fops,
 };
 
diff -Nru a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
--- a/drivers/char/watchdog/ixp4xx_wdt.c	2005-01-28 14:50:17 -08:00
+++ b/drivers/char/watchdog/ixp4xx_wdt.c	2005-01-28 14:50:17 -08:00
@@ -180,7 +180,7 @@
 static struct miscdevice ixp4xx_wdt_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "IXP4xx Watchdog",
+	.name		= "watchdog",
 	.fops		= &ixp4xx_wdt_fops,
 };
 
diff -Nru a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
--- a/drivers/char/watchdog/sa1100_wdt.c	2005-01-28 14:50:17 -08:00
+++ b/drivers/char/watchdog/sa1100_wdt.c	2005-01-28 14:50:17 -08:00
@@ -176,7 +176,7 @@
 static struct miscdevice sa1100dog_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "SA1100/PXA2xx watchdog",
+	.name		= "watchdog",
 	.fops		= &sa1100dog_fops,
 };
 
diff -Nru a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
--- a/drivers/char/watchdog/scx200_wdt.c	2005-01-28 14:50:17 -08:00
+++ b/drivers/char/watchdog/scx200_wdt.c	2005-01-28 14:50:17 -08:00
@@ -210,7 +210,7 @@
 
 static struct miscdevice scx200_wdt_miscdev = {
 	.minor = WATCHDOG_MINOR,
-	.name  = NAME,
+	.name  = NAME, /* make that "watchdog" ? */
 	.fops  = &scx200_wdt_fops,
 };
 
