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

Commit 45dafe98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel Panther Point PCH
parents fc7b3ff1 aa1f4652

drivers/watchdog/iTCO_wdt.c

+97 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
 *	document number 324645-001, 324646-001: Cougar Point (CPT)

 *	document number TBD                   : Patsburg (PBG)

 *	document number TBD                   : DH89xxCC

 *	document number TBD                   : Panther Point

 */



/*
@@ -153,6 +154,38 @@ enum iTCO_chipsets { 
	TCO_PBG1,	/* Patsburg */

	TCO_PBG2,	/* Patsburg */

	TCO_DH89XXCC,	/* DH89xxCC */

	TCO_PPT0,	/* Panther Point */

	TCO_PPT1,	/* Panther Point */

	TCO_PPT2,	/* Panther Point */

	TCO_PPT3,	/* Panther Point */

	TCO_PPT4,	/* Panther Point */

	TCO_PPT5,	/* Panther Point */

	TCO_PPT6,	/* Panther Point */

	TCO_PPT7,	/* Panther Point */

	TCO_PPT8,	/* Panther Point */

	TCO_PPT9,	/* Panther Point */

	TCO_PPT10,	/* Panther Point */

	TCO_PPT11,	/* Panther Point */

	TCO_PPT12,	/* Panther Point */

	TCO_PPT13,	/* Panther Point */

	TCO_PPT14,	/* Panther Point */

	TCO_PPT15,	/* Panther Point */

	TCO_PPT16,	/* Panther Point */

	TCO_PPT17,	/* Panther Point */

	TCO_PPT18,	/* Panther Point */

	TCO_PPT19,	/* Panther Point */

	TCO_PPT20,	/* Panther Point */

	TCO_PPT21,	/* Panther Point */

	TCO_PPT22,	/* Panther Point */

	TCO_PPT23,	/* Panther Point */

	TCO_PPT24,	/* Panther Point */

	TCO_PPT25,	/* Panther Point */

	TCO_PPT26,	/* Panther Point */

	TCO_PPT27,	/* Panther Point */

	TCO_PPT28,	/* Panther Point */

	TCO_PPT29,	/* Panther Point */

	TCO_PPT30,	/* Panther Point */

	TCO_PPT31,	/* Panther Point */

};



static struct {
@@ -244,6 +277,38 @@ static struct { 
	{"Patsburg", 2},

	{"Patsburg", 2},

	{"DH89xxCC", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{"Panther Point", 2},

	{NULL, 0}

};
@@ -363,6 +428,38 @@ static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = { 
	{ ITCO_PCI_DEVICE(0x1d40,				TCO_PBG1)},

	{ ITCO_PCI_DEVICE(0x1d41,				TCO_PBG2)},

	{ ITCO_PCI_DEVICE(0x2310,				TCO_DH89XXCC)},

	{ ITCO_PCI_DEVICE(0x1e40,				TCO_PPT0)},

	{ ITCO_PCI_DEVICE(0x1e41,				TCO_PPT1)},

	{ ITCO_PCI_DEVICE(0x1e42,				TCO_PPT2)},

	{ ITCO_PCI_DEVICE(0x1e43,				TCO_PPT3)},

	{ ITCO_PCI_DEVICE(0x1e44,				TCO_PPT4)},

	{ ITCO_PCI_DEVICE(0x1e45,				TCO_PPT5)},

	{ ITCO_PCI_DEVICE(0x1e46,				TCO_PPT6)},

	{ ITCO_PCI_DEVICE(0x1e47,				TCO_PPT7)},

	{ ITCO_PCI_DEVICE(0x1e48,				TCO_PPT8)},

	{ ITCO_PCI_DEVICE(0x1e49,				TCO_PPT9)},

	{ ITCO_PCI_DEVICE(0x1e4a,				TCO_PPT10)},

	{ ITCO_PCI_DEVICE(0x1e4b,				TCO_PPT11)},

	{ ITCO_PCI_DEVICE(0x1e4c,				TCO_PPT12)},

	{ ITCO_PCI_DEVICE(0x1e4d,				TCO_PPT13)},

	{ ITCO_PCI_DEVICE(0x1e4e,				TCO_PPT14)},

	{ ITCO_PCI_DEVICE(0x1e4f,				TCO_PPT15)},

	{ ITCO_PCI_DEVICE(0x1e50,				TCO_PPT16)},

	{ ITCO_PCI_DEVICE(0x1e51,				TCO_PPT17)},

	{ ITCO_PCI_DEVICE(0x1e52,				TCO_PPT18)},

	{ ITCO_PCI_DEVICE(0x1e53,				TCO_PPT19)},

	{ ITCO_PCI_DEVICE(0x1e54,				TCO_PPT20)},

	{ ITCO_PCI_DEVICE(0x1e55,				TCO_PPT21)},

	{ ITCO_PCI_DEVICE(0x1e56,				TCO_PPT22)},

	{ ITCO_PCI_DEVICE(0x1e57,				TCO_PPT23)},

	{ ITCO_PCI_DEVICE(0x1e58,				TCO_PPT24)},

	{ ITCO_PCI_DEVICE(0x1e59,				TCO_PPT25)},

	{ ITCO_PCI_DEVICE(0x1e5a,				TCO_PPT26)},

	{ ITCO_PCI_DEVICE(0x1e5b,				TCO_PPT27)},

	{ ITCO_PCI_DEVICE(0x1e5c,				TCO_PPT28)},

	{ ITCO_PCI_DEVICE(0x1e5d,				TCO_PPT29)},

	{ ITCO_PCI_DEVICE(0x1e5e,				TCO_PPT30)},

	{ ITCO_PCI_DEVICE(0x1e5f,				TCO_PPT31)},

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

};

MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);