2 files changed, 92 insertions, 0 deletions

diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index a3b112f06b21..727b96d30060 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -110,7 +110,53 @@ static struct ichwd_device ichwd_devices[] = {
 	{ DEVICEID_ICH10D,   "Intel ICH10D watchdog timer",	10 },
 	{ DEVICEID_ICH10DO,  "Intel ICH10DO watchdog timer",	10 },
 	{ DEVICEID_ICH10R,   "Intel ICH10R watchdog timer",	10 },
+	{ DEVICEID_PCH,      "Intel PCH watchdog timer",	10 },
+	{ DEVICEID_PCHM,     "Intel PCH watchdog timer",	10 },
+	{ DEVICEID_P55,      "Intel P55 watchdog timer",	10 },
+	{ DEVICEID_PM55,     "Intel PM55 watchdog timer",	10 },
 	{ DEVICEID_H55,      "Intel H55 watchdog timer",	10 },
+	{ DEVICEID_QM57,     "Intel QM57 watchdog timer",       10 },
+	{ DEVICEID_H57,      "Intel H57 watchdog timer",        10 },
+	{ DEVICEID_HM55,     "Intel HM55 watchdog timer",       10 },
+	{ DEVICEID_Q57,      "Intel Q57 watchdog timer",        10 },
+	{ DEVICEID_HM57,     "Intel HM57 watchdog timer",       10 },
+	{ DEVICEID_PCHMSFF,  "Intel PCHMSFF watchdog timer",    10 },
+	{ DEVICEID_QS57,     "Intel QS57 watchdog timer",       10 },
+	{ DEVICEID_3400,     "Intel 3400 watchdog timer",       10 },
+	{ DEVICEID_3420,     "Intel 3420 watchdog timer",       10 },
+	{ DEVICEID_3450,     "Intel 3450 watchdog timer",       10 },
+	{ DEVICEID_CPT0,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT1,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT2,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT3,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT4,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT5,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT6,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT7,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT8,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT9,     "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT10,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT11,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT12,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT13,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT14,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT15,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT16,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT17,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT18,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT19,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT20,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT21,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT22,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT23,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT23,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT25,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT26,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT27,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT28,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT29,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT30,    "Intel Cougar Point watchdog timer",	10 },
+	{ DEVICEID_CPT31,    "Intel Cougar Point watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index 9cc8f1b65d47..c0a11414468c 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -64,6 +64,38 @@ struct ichwd_softc {
 };
 
 #define VENDORID_INTEL		0x8086
+#define DEVICEID_CPT0		0x1c40
+#define DEVICEID_CPT1		0x1c41
+#define DEVICEID_CPT2		0x1c42
+#define DEVICEID_CPT3		0x1c43
+#define DEVICEID_CPT4		0x1c44
+#define DEVICEID_CPT5		0x1c45
+#define DEVICEID_CPT6		0x1c46
+#define DEVICEID_CPT7		0x1c47
+#define DEVICEID_CPT8		0x1c48
+#define DEVICEID_CPT9		0x1c49
+#define DEVICEID_CPT10		0x1c4a
+#define DEVICEID_CPT11		0x1c4b
+#define DEVICEID_CPT12		0x1c4c
+#define DEVICEID_CPT13		0x1c4d
+#define DEVICEID_CPT14		0x1c4e
+#define DEVICEID_CPT15		0x1c4f
+#define DEVICEID_CPT16		0x1c50
+#define DEVICEID_CPT17		0x1c51
+#define DEVICEID_CPT18		0x1c52
+#define DEVICEID_CPT19		0x1c53
+#define DEVICEID_CPT20		0x1c54
+#define DEVICEID_CPT21		0x1c55
+#define DEVICEID_CPT22		0x1c56
+#define DEVICEID_CPT23		0x1c57
+#define DEVICEID_CPT24		0x1c58
+#define DEVICEID_CPT25		0x1c59
+#define DEVICEID_CPT26		0x1c5a
+#define DEVICEID_CPT27		0x1c5b
+#define DEVICEID_CPT28		0x1c5c
+#define DEVICEID_CPT29		0x1c5d
+#define DEVICEID_CPT30		0x1c5e
+#define DEVICEID_CPT31		0x1c5f
 #define DEVICEID_82801AA	0x2410
 #define DEVICEID_82801AB	0x2420
 #define DEVICEID_82801BA	0x2440
@@ -100,7 +132,21 @@ struct ichwd_softc {
 #define DEVICEID_ICH10D		0x3a1a
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
+#define DEVICEID_PCH		0x3b00
+#define DEVICEID_PCHM		0x3b01
+#define DEVICEID_P55		0x3b02
+#define DEVICEID_PM55		0x3b03
 #define DEVICEID_H55		0x3b06
+#define DEVICEID_QM57		0x3b07
+#define DEVICEID_H57		0x3b08
+#define DEVICEID_HM55		0x3b09
+#define DEVICEID_Q57		0x3b0a
+#define DEVICEID_HM57		0x3b0b
+#define DEVICEID_PCHMSFF	0x3b0d
+#define DEVICEID_QS57		0x3b0f
+#define DEVICEID_3400		0x3b12
+#define DEVICEID_3420		0x3b14
+#define DEVICEID_3450		0x3b16
 
 /* ICH LPC Interface Bridge Registers (ICH5 and older) */
 #define ICH_GEN_STA		0xd4