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

Commit 28d41f53 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[WATCHDOG] iTCO_wdt: add PCI ID's for ICH9 & ICH10 chipsets 



Add support for the following I/O controller hubs:
ICH7DH, ICH9M, ICH9M-E, ICH10, ICH10R, ICH10D and ICH10DO.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent c6904ddb

drivers/watchdog/iTCO_wdt.c

+73 −45
Original line number Diff line number Diff line
@@ -20,34 +20,41 @@ 
 *	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,

 *	82801DB  (ICH4)      : document number 290744-001, 290745-025,

 *	82801DBM (ICH4-M)    : document number 252337-001, 252663-008,

 *	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-003, 313057-009,

 *	82801HR  (ICH8R)     : document number 313056-003, 313057-009,

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

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

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

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

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

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

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

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

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

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

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

 *	82801EB  (ICH5)      : document number 252516-001, 252517-028,

 *	82801ER  (ICH5R)     : document number 252516-001, 252517-028,

 *	6300ESB  (6300ESB)   : document number 300641-004, 300884-013,

 *	82801FB  (ICH6)      : document number 301473-002, 301474-026,

 *	82801FR  (ICH6R)     : document number 301473-002, 301474-026,

 *	82801FBM (ICH6-M)    : document number 301473-002, 301474-026,

 *	82801FW  (ICH6W)     : document number 301473-001, 301474-026,

 *	82801FRW (ICH6RW)    : document number 301473-001, 301474-026,

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

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

 *	82801GB  (ICH7)      : document number 307013-003, 307014-024,

 *	82801GR  (ICH7R)     : document number 307013-003, 307014-024,

 *	82801GDH (ICH7DH)    : document number 307013-003, 307014-024,

 *	82801GBM (ICH7-M)    : document number 307013-003, 307014-024,

 *	82801GHM (ICH7-M DH) : document number 307013-003, 307014-024,

 *	82801GU  (ICH7-U)    : document number 307013-003, 307014-024,

 *	82801HB  (ICH8)      : document number 313056-003, 313057-017,

 *	82801HR  (ICH8R)     : document number 313056-003, 313057-017,

 *	82801HBM (ICH8M)     : document number 313056-003, 313057-017,

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

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

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

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

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

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

 *	82801IO  (ICH9DO)    : document number 316972-004, 316973-012,

 *	82801IBM (ICH9M)     : document number 316972-004, 316973-012,

 *	82801IEM (ICH9M-E)   : document number 316972-004, 316973-012,

 *	82801JIB (ICH10)     : document number 319973-002, 319974-002,

 *	82801JIR (ICH10R)    : document number 319973-002, 319974-002,

 *	82801JD  (ICH10D)    : document number 319973-002, 319974-002,

 *	82801JDO (ICH10DO)   : document number 319973-002, 319974-002

 */



/*
@@ -95,19 +102,26 @@ enum iTCO_chipsets { 
	TCO_ICH6,	/* ICH6 & ICH6R */

	TCO_ICH6M,	/* ICH6-M */

	TCO_ICH6W,	/* ICH6W & ICH6RW */

	TCO_631XESB,	/* 631xESB/632xESB */

	TCO_ICH7,	/* ICH7 & ICH7R */

	TCO_ICH7M,	/* ICH7-M */

	TCO_ICH7DH,	/* ICH7DH */

	TCO_ICH7M,	/* ICH7-M & ICH7-U */

	TCO_ICH7MDH,	/* ICH7-M DH */

	TCO_ICH8,	/* ICH8 & ICH8R */

	TCO_ICH8ME,	/* ICH8M-E */

	TCO_ICH8DH,	/* ICH8DH */

	TCO_ICH8DO,	/* ICH8DO */

	TCO_ICH8M,	/* ICH8M */

	TCO_ICH8ME,	/* ICH8M-E */

	TCO_ICH9,	/* ICH9 */

	TCO_ICH9R,	/* ICH9R */

	TCO_ICH9DH,	/* ICH9DH */

	TCO_ICH9DO,	/* ICH9DO */

	TCO_631XESB,	/* 631xESB/632xESB */

	TCO_ICH9M,	/* ICH9M */

	TCO_ICH9ME,	/* ICH9M-E */

	TCO_ICH10,	/* ICH10 */

	TCO_ICH10R,	/* ICH10R */

	TCO_ICH10D,	/* ICH10D */

	TCO_ICH10DO,	/* ICH10DO */

};



static struct {
@@ -128,19 +142,26 @@ static struct { 
	{"ICH6 or ICH6R", 2},

	{"ICH6-M", 2},

	{"ICH6W or ICH6RW", 2},

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

	{"ICH7 or ICH7R", 2},

	{"ICH7-M", 2},

	{"ICH7DH", 2},

	{"ICH7-M or ICH7-U", 2},

	{"ICH7-M DH", 2},

	{"ICH8 or ICH8R", 2},

	{"ICH8M-E", 2},

	{"ICH8DH", 2},

	{"ICH8DO", 2},

	{"ICH8M", 2},

	{"ICH8M-E", 2},

	{"ICH9", 2},

	{"ICH9R", 2},

	{"ICH9DH", 2},

	{"ICH9DO", 2},

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

	{"ICH9M", 2},

	{"ICH9M-E", 2},

	{"ICH10", 2},

	{"ICH10R", 2},

	{"ICH10D", 2},

	{"ICH10DO", 2},

	{NULL, 0}

};
@@ -174,18 +195,6 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { 
	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_0,		TCO_ICH6)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_1,		TCO_ICH6M)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_2,		TCO_ICH6W)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,		TCO_ICH7)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,		TCO_ICH7M)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,		TCO_ICH7MDH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,		TCO_ICH8)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,		TCO_ICH8ME)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,		TCO_ICH8DH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,		TCO_ICH8DO)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,		TCO_ICH8M)},

	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9)},

	{ 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_4,		TCO_ICH9DO)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,		TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2671,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x2672,				TCO_631XESB)},
@@ -202,6 +211,25 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { 
	{ ITCO_PCI_DEVICE(0x267d,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x267e,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(0x267f,				TCO_631XESB)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,		TCO_ICH7)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_30,		TCO_ICH7DH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,		TCO_ICH7M)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,		TCO_ICH7MDH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,		TCO_ICH8)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,		TCO_ICH8DH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,		TCO_ICH8DO)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,		TCO_ICH8M)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,		TCO_ICH8ME)},

	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9)},

	{ 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_4,		TCO_ICH9DO)},

	{ ITCO_PCI_DEVICE(0x2919,				TCO_ICH9M)},

	{ ITCO_PCI_DEVICE(0x2917,				TCO_ICH9ME)},

	{ ITCO_PCI_DEVICE(0x3a18,				TCO_ICH10)},

	{ ITCO_PCI_DEVICE(0x3a16,				TCO_ICH10R)},

	{ ITCO_PCI_DEVICE(0x3a1a,				TCO_ICH10D)},

	{ ITCO_PCI_DEVICE(0x3a14,				TCO_ICH10DO)},

	{ 0, },			/* End of list */

};

MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);