1 files changed, 93 insertions, 6 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 44bc6aa46edf..8da886035374 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -115,8 +115,37 @@ enum iTCO_chipsets {
        TCO_3420,       /* 3420 */
        TCO_3450,       /* 3450 */
        TCO_EP80579,    /* EP80579 */
-        TCO_CPTD,       /* CPT Desktop */
+        TCO_CPT1,       /* Cougar Point */
-        TCO_CPTM,       /* CPT Mobile */
+        TCO_CPT2,       /* Cougar Point Desktop */
+        TCO_CPT3,       /* Cougar Point Mobile */
+        TCO_CPT4,       /* Cougar Point */
+        TCO_CPT5,       /* Cougar Point */
+        TCO_CPT6,       /* Cougar Point */
+        TCO_CPT7,       /* Cougar Point */
+        TCO_CPT8,       /* Cougar Point */
+        TCO_CPT9,       /* Cougar Point */
+        TCO_CPT10,      /* Cougar Point */
+        TCO_CPT11,      /* Cougar Point */
+        TCO_CPT12,      /* Cougar Point */
+        TCO_CPT13,      /* Cougar Point */
+        TCO_CPT14,      /* Cougar Point */
+        TCO_CPT15,      /* Cougar Point */
+        TCO_CPT16,      /* Cougar Point */
+        TCO_CPT17,      /* Cougar Point */
+        TCO_CPT18,      /* Cougar Point */
+        TCO_CPT19,      /* Cougar Point */
+        TCO_CPT20,      /* Cougar Point */
+        TCO_CPT21,      /* Cougar Point */
+        TCO_CPT22,      /* Cougar Point */
+        TCO_CPT23,      /* Cougar Point */
+        TCO_CPT24,      /* Cougar Point */
+        TCO_CPT25,      /* Cougar Point */
+        TCO_CPT26,      /* Cougar Point */
+        TCO_CPT27,      /* Cougar Point */
+        TCO_CPT28,      /* Cougar Point */
+        TCO_CPT29,      /* Cougar Point */
+        TCO_CPT30,      /* Cougar Point */
+        TCO_CPT31,      /* Cougar Point */
 };
 static struct {
@@ -173,8 +202,37 @@ static struct {
        {"3420", 2},
        {"3450", 2},
        {"EP80579", 2},
-        {"CPT Desktop", 2},
+        {"Cougar Point", 2},
-        {"CPT Mobile", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
+        {"Cougar Point", 2},
        {NULL, 0}
 };
@@ -259,8 +317,37 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
        { ITCO_PCI_DEVICE(0x3b14,                               TCO_3420)},
        { ITCO_PCI_DEVICE(0x3b16,                               TCO_3450)},
        { ITCO_PCI_DEVICE(0x5031,                               TCO_EP80579)},
-        { ITCO_PCI_DEVICE(0x1c42,                               TCO_CPTD)},
+        { ITCO_PCI_DEVICE(0x1c41,                               TCO_CPT1)},
-        { ITCO_PCI_DEVICE(0x1c43,                               TCO_CPTM)},
+        { ITCO_PCI_DEVICE(0x1c42,                               TCO_CPT2)},
+        { ITCO_PCI_DEVICE(0x1c43,                               TCO_CPT3)},
+        { ITCO_PCI_DEVICE(0x1c44,                               TCO_CPT4)},
+        { ITCO_PCI_DEVICE(0x1c45,                               TCO_CPT5)},
+        { ITCO_PCI_DEVICE(0x1c46,                               TCO_CPT6)},
+        { ITCO_PCI_DEVICE(0x1c47,                               TCO_CPT7)},
+        { ITCO_PCI_DEVICE(0x1c48,                               TCO_CPT8)},
+        { ITCO_PCI_DEVICE(0x1c49,                               TCO_CPT9)},
+        { ITCO_PCI_DEVICE(0x1c4a,                               TCO_CPT10)},
+        { ITCO_PCI_DEVICE(0x1c4b,                               TCO_CPT11)},
+        { ITCO_PCI_DEVICE(0x1c4c,                               TCO_CPT12)},
+        { ITCO_PCI_DEVICE(0x1c4d,                               TCO_CPT13)},
+        { ITCO_PCI_DEVICE(0x1c4e,                               TCO_CPT14)},
+        { ITCO_PCI_DEVICE(0x1c4f,                               TCO_CPT15)},
+        { ITCO_PCI_DEVICE(0x1c50,                               TCO_CPT16)},
+        { ITCO_PCI_DEVICE(0x1c51,                               TCO_CPT17)},
+        { ITCO_PCI_DEVICE(0x1c52,                               TCO_CPT18)},
+        { ITCO_PCI_DEVICE(0x1c53,                               TCO_CPT19)},
+        { ITCO_PCI_DEVICE(0x1c54,                               TCO_CPT20)},
+        { ITCO_PCI_DEVICE(0x1c55,                               TCO_CPT21)},
+        { ITCO_PCI_DEVICE(0x1c56,                               TCO_CPT22)},
+        { ITCO_PCI_DEVICE(0x1c57,                               TCO_CPT23)},
+        { ITCO_PCI_DEVICE(0x1c58,                               TCO_CPT24)},
+        { ITCO_PCI_DEVICE(0x1c59,                               TCO_CPT25)},
+        { ITCO_PCI_DEVICE(0x1c5a,                               TCO_CPT26)},
+        { ITCO_PCI_DEVICE(0x1c5b,                               TCO_CPT27)},
+        { ITCO_PCI_DEVICE(0x1c5c,                               TCO_CPT28)},
+        { ITCO_PCI_DEVICE(0x1c5d,                               TCO_CPT29)},
+        { ITCO_PCI_DEVICE(0x1c5e,                               TCO_CPT30)},
+        { ITCO_PCI_DEVICE(0x1c5f,                               TCO_CPT31)},
        { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 44bc6aa46edf..8da886035374 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c
@@ -115,8 +115,37 @@ enum iTCO_chipsets {
115	TCO_3420, /* 3420 */	115	TCO_3420, /* 3420 */
116	TCO_3450, /* 3450 */	116	TCO_3450, /* 3450 */
117	TCO_EP80579, /* EP80579 */	117	TCO_EP80579, /* EP80579 */
118	TCO_CPTD, /* CPT Desktop */	118	TCO_CPT1, /* Cougar Point */
119	TCO_CPTM, /* CPT Mobile */	119	TCO_CPT2, /* Cougar Point Desktop */
		120	TCO_CPT3, /* Cougar Point Mobile */
		121	TCO_CPT4, /* Cougar Point */
		122	TCO_CPT5, /* Cougar Point */
		123	TCO_CPT6, /* Cougar Point */
		124	TCO_CPT7, /* Cougar Point */
		125	TCO_CPT8, /* Cougar Point */
		126	TCO_CPT9, /* Cougar Point */
		127	TCO_CPT10, /* Cougar Point */
		128	TCO_CPT11, /* Cougar Point */
		129	TCO_CPT12, /* Cougar Point */
		130	TCO_CPT13, /* Cougar Point */
		131	TCO_CPT14, /* Cougar Point */
		132	TCO_CPT15, /* Cougar Point */
		133	TCO_CPT16, /* Cougar Point */
		134	TCO_CPT17, /* Cougar Point */
		135	TCO_CPT18, /* Cougar Point */
		136	TCO_CPT19, /* Cougar Point */
		137	TCO_CPT20, /* Cougar Point */
		138	TCO_CPT21, /* Cougar Point */
		139	TCO_CPT22, /* Cougar Point */
		140	TCO_CPT23, /* Cougar Point */
		141	TCO_CPT24, /* Cougar Point */
		142	TCO_CPT25, /* Cougar Point */
		143	TCO_CPT26, /* Cougar Point */
		144	TCO_CPT27, /* Cougar Point */
		145	TCO_CPT28, /* Cougar Point */
		146	TCO_CPT29, /* Cougar Point */
		147	TCO_CPT30, /* Cougar Point */
		148	TCO_CPT31, /* Cougar Point */
120	};	149	};
121		150
122	static struct {	151	static struct {
@@ -173,8 +202,37 @@ static struct {
173	{"3420", 2},	202	{"3420", 2},
174	{"3450", 2},	203	{"3450", 2},
175	{"EP80579", 2},	204	{"EP80579", 2},
176	{"CPT Desktop", 2},	205	{"Cougar Point", 2},
177	{"CPT Mobile", 2},	206	{"Cougar Point", 2},
		207	{"Cougar Point", 2},
		208	{"Cougar Point", 2},
		209	{"Cougar Point", 2},
		210	{"Cougar Point", 2},
		211	{"Cougar Point", 2},
		212	{"Cougar Point", 2},
		213	{"Cougar Point", 2},
		214	{"Cougar Point", 2},
		215	{"Cougar Point", 2},
		216	{"Cougar Point", 2},
		217	{"Cougar Point", 2},
		218	{"Cougar Point", 2},
		219	{"Cougar Point", 2},
		220	{"Cougar Point", 2},
		221	{"Cougar Point", 2},
		222	{"Cougar Point", 2},
		223	{"Cougar Point", 2},
		224	{"Cougar Point", 2},
		225	{"Cougar Point", 2},
		226	{"Cougar Point", 2},
		227	{"Cougar Point", 2},
		228	{"Cougar Point", 2},
		229	{"Cougar Point", 2},
		230	{"Cougar Point", 2},
		231	{"Cougar Point", 2},
		232	{"Cougar Point", 2},
		233	{"Cougar Point", 2},
		234	{"Cougar Point", 2},
		235	{"Cougar Point", 2},
178	{NULL, 0}	236	{NULL, 0}
179	};	237	};
180		238
@@ -259,8 +317,37 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
259	{ ITCO_PCI_DEVICE(0x3b14, TCO_3420)},	317	{ ITCO_PCI_DEVICE(0x3b14, TCO_3420)},
260	{ ITCO_PCI_DEVICE(0x3b16, TCO_3450)},	318	{ ITCO_PCI_DEVICE(0x3b16, TCO_3450)},
261	{ ITCO_PCI_DEVICE(0x5031, TCO_EP80579)},	319	{ ITCO_PCI_DEVICE(0x5031, TCO_EP80579)},
262	{ ITCO_PCI_DEVICE(0x1c42, TCO_CPTD)},	320	{ ITCO_PCI_DEVICE(0x1c41, TCO_CPT1)},
263	{ ITCO_PCI_DEVICE(0x1c43, TCO_CPTM)},	321	{ ITCO_PCI_DEVICE(0x1c42, TCO_CPT2)},
		322	{ ITCO_PCI_DEVICE(0x1c43, TCO_CPT3)},
		323	{ ITCO_PCI_DEVICE(0x1c44, TCO_CPT4)},
		324	{ ITCO_PCI_DEVICE(0x1c45, TCO_CPT5)},
		325	{ ITCO_PCI_DEVICE(0x1c46, TCO_CPT6)},
		326	{ ITCO_PCI_DEVICE(0x1c47, TCO_CPT7)},
		327	{ ITCO_PCI_DEVICE(0x1c48, TCO_CPT8)},
		328	{ ITCO_PCI_DEVICE(0x1c49, TCO_CPT9)},
		329	{ ITCO_PCI_DEVICE(0x1c4a, TCO_CPT10)},
		330	{ ITCO_PCI_DEVICE(0x1c4b, TCO_CPT11)},
		331	{ ITCO_PCI_DEVICE(0x1c4c, TCO_CPT12)},
		332	{ ITCO_PCI_DEVICE(0x1c4d, TCO_CPT13)},
		333	{ ITCO_PCI_DEVICE(0x1c4e, TCO_CPT14)},
		334	{ ITCO_PCI_DEVICE(0x1c4f, TCO_CPT15)},
		335	{ ITCO_PCI_DEVICE(0x1c50, TCO_CPT16)},
		336	{ ITCO_PCI_DEVICE(0x1c51, TCO_CPT17)},
		337	{ ITCO_PCI_DEVICE(0x1c52, TCO_CPT18)},
		338	{ ITCO_PCI_DEVICE(0x1c53, TCO_CPT19)},
		339	{ ITCO_PCI_DEVICE(0x1c54, TCO_CPT20)},
		340	{ ITCO_PCI_DEVICE(0x1c55, TCO_CPT21)},
		341	{ ITCO_PCI_DEVICE(0x1c56, TCO_CPT22)},
		342	{ ITCO_PCI_DEVICE(0x1c57, TCO_CPT23)},
		343	{ ITCO_PCI_DEVICE(0x1c58, TCO_CPT24)},
		344	{ ITCO_PCI_DEVICE(0x1c59, TCO_CPT25)},
		345	{ ITCO_PCI_DEVICE(0x1c5a, TCO_CPT26)},
		346	{ ITCO_PCI_DEVICE(0x1c5b, TCO_CPT27)},
		347	{ ITCO_PCI_DEVICE(0x1c5c, TCO_CPT28)},
		348	{ ITCO_PCI_DEVICE(0x1c5d, TCO_CPT29)},
		349	{ ITCO_PCI_DEVICE(0x1c5e, TCO_CPT30)},
		350	{ ITCO_PCI_DEVICE(0x1c5f, TCO_CPT31)},
264	{ 0, }, /* End of list */	351	{ 0, }, /* End of list */
265	};	352	};
266	MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);	353	MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);