Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49056da authored by Gabriel C's avatar Gabriel C Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver 



Add the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bump
the driver version.

Tested on an P5E-VM DO ASUS motherboard.

Signed-off-by: default avatarGabriel Craciunescu <nix.or.die@googlemail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f172ddc6

drivers/watchdog/iTCO_wdt.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -41,9 +41,10 @@ 
 *	82801HH  (ICH8DH)    : document number 313056-003, 313057-009,

 *	82801HH  (ICH8DH)    : document number 313056-003, 313057-009,

 *	82801HO  (ICH8DO)    : document number 313056-003, 313057-009,

 *	82801HO  (ICH8DO)    : document number 313056-003, 313057-009,

 *	82801HEM (ICH8M-E)   : document number 313056-003, 313057-009,

 *	82801HEM (ICH8M-E)   : document number 313056-003, 313057-009,

 *	82801IB  (ICH9)      : document number 316972-001, 316973-001,

 *	82801IB  (ICH9)      : document number 316972-001, 316973-006,

 *	82801IR  (ICH9R)     : document number 316972-001, 316973-001,

 *	82801IR  (ICH9R)     : document number 316972-001, 316973-006,

 *	82801IH  (ICH9DH)    : document number 316972-001, 316973-001,

 *	82801IH  (ICH9DH)    : document number 316972-001, 316973-006,

 *	82801IO  (ICH9DO)    : document number 316972-001, 316973-006,

 *	6300ESB  (6300ESB)   : document number 300641-003, 300884-010,

 *	6300ESB  (6300ESB)   : document number 300641-003, 300884-010,

 *	631xESB  (631xESB)   : document number 313082-001, 313075-005,

 *	631xESB  (631xESB)   : document number 313082-001, 313075-005,

 *	632xESB  (632xESB)   : document number 313082-001, 313075-005

 *	632xESB  (632xESB)   : document number 313082-001, 313075-005
@@ -55,8 +56,8 @@ 




/* Module and version information */

/* Module and version information */

#define DRV_NAME        "iTCO_wdt"

#define DRV_NAME        "iTCO_wdt"

#define DRV_VERSION     "1.02"

#define DRV_VERSION     "1.03"

#define DRV_RELDATE     "26-Jul-2007"

#define DRV_RELDATE     "30-Apr-2008"

#define PFX		DRV_NAME ": "

#define PFX		DRV_NAME ": "





/* Includes */

/* Includes */
@@ -104,6 +105,7 @@ enum iTCO_chipsets { 
	TCO_ICH9,	/* ICH9 */

	TCO_ICH9,	/* ICH9 */

	TCO_ICH9R,	/* ICH9R */

	TCO_ICH9R,	/* ICH9R */

	TCO_ICH9DH,	/* ICH9DH */

	TCO_ICH9DH,	/* ICH9DH */

	TCO_ICH9DO,     /* ICH9DO */

	TCO_631XESB,	/* 631xESB/632xESB */

	TCO_631XESB,	/* 631xESB/632xESB */

};

};
@@ -136,6 +138,7 @@ static struct { 
	{"ICH9", 2},

	{"ICH9", 2},

	{"ICH9R", 2},

	{"ICH9R", 2},

	{"ICH9DH", 2},

	{"ICH9DH", 2},

	{"ICH9DO", 2},

	{"631xESB/632xESB", 2},

	{"631xESB/632xESB", 2},

	{NULL,0}

	{NULL,0}

};

};
@@ -181,6 +184,7 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { 
	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9   )},

	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9   )},

	{ ITCO_PCI_DEVICE(0x2916,				TCO_ICH9R  )},

	{ ITCO_PCI_DEVICE(0x2916,				TCO_ICH9R  )},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,		TCO_ICH9DH )},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,		TCO_ICH9DH )},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO )},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,		TCO_631XESB)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,		TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2671,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2671,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2672,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2672,				TCO_631XESB)},