From 88dd3ad08cfa196278fe7139acd3a3fe6f838cf7 Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Mon, 25 Aug 2008 15:23:54 +0000
Subject: [PATCH] Add more PCI IDs including those for ICH10.

PR:		kern/126736
Submitted by:	Olivier Smedts  olivier of gid0 org
MFC after:	1 week
---
 sys/dev/ichwd/ichwd.c | 17 +++++++++++++----
 sys/dev/ichwd/ichwd.h | 11 ++++++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 38f9d55ec6d5..35f8b5f7cb2a 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -82,23 +82,32 @@ static struct ichwd_device ichwd_devices[] = {
 	{ DEVICEID_82801DB,  "Intel 82801DB watchdog timer",	4 },
 	{ DEVICEID_82801DBM, "Intel 82801DBM watchdog timer",	4 },
 	{ DEVICEID_82801E,   "Intel 82801E watchdog timer",	5 },
-	{ DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer", 5 },
+	{ DEVICEID_82801EB,  "Intel 82801EB watchdog timer",	5 },
+	{ DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer",	5 },
 	{ DEVICEID_6300ESB,  "Intel 6300ESB watchdog timer",	5 },
-	{ DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer", 6 },
+	{ DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer",	6 },
 	{ DEVICEID_ICH6M,    "Intel ICH6M watchdog timer",	6 },
 	{ DEVICEID_ICH6W,    "Intel ICH6W watchdog timer",	6 },
 	{ DEVICEID_ICH7,     "Intel ICH7 watchdog timer",	7 },
+	{ DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",	7 },
 	{ DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",	7 },
 	{ DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",	7 },
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",	8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",	8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",	8 },
-	{ DEVICEID_ICH8M,    "Intel ICH8M watchdog timer",      8 },
+	{ DEVICEID_ICH8M,    "Intel ICH8M watchdog timer",	8 },
+	{ DEVICEID_ICH8ME,   "Intel ICH8M-E watchdog timer",	8 },
 	{ DEVICEID_63XXESB,  "Intel 63XXESB watchdog timer",	8 },
 	{ DEVICEID_ICH9,     "Intel ICH9 watchdog timer",	9 },
-	{ DEVICEID_ICH9R,    "Intel ICH9R watchdog timer",	9 },
 	{ DEVICEID_ICH9DH,   "Intel ICH9DH watchdog timer",	9 },
 	{ DEVICEID_ICH9DO,   "Intel ICH9DO watchdog timer",	9 },
+	{ DEVICEID_ICH9M,    "Intel ICH9M watchdog timer",	9 },
+	{ DEVICEID_ICH9ME,   "Intel ICH9M-E watchdog timer",	9 },
+	{ DEVICEID_ICH9R,    "Intel ICH9R watchdog timer",	9 },
+	{ DEVICEID_ICH10,    "Intel ICH10 watchdog timer",	10 },
+	{ DEVICEID_ICH10D,   "Intel ICH10D watchdog timer",	10 },
+	{ DEVICEID_ICH10DO,  "Intel ICH10DO watchdog timer",	10 },
+	{ DEVICEID_ICH10R,   "Intel ICH10R watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index 414b9a80acce..51ed26ddfd9f 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -73,6 +73,7 @@ struct ichwd_softc {
 #define DEVICEID_82801DB	0x24c0
 #define DEVICEID_82801DBM	0x24cc
 #define DEVICEID_82801E		0x2450
+#define DEVICEID_82801EB	0x24dc
 #define DEVICEID_82801EBR	0x24d0
 #define DEVICEID_6300ESB	0x25a1
 #define DEVICEID_82801FBR	0x2640
@@ -80,16 +81,24 @@ struct ichwd_softc {
 #define DEVICEID_ICH6W		0x2642
 #define DEVICEID_63XXESB	0x2670
 #define DEVICEID_ICH7		0x27b8
+#define DEVICEID_ICH7DH		0x27b0
 #define DEVICEID_ICH7M		0x27b9
 #define DEVICEID_ICH7MDH	0x27bd
 #define DEVICEID_ICH8		0x2810
 #define DEVICEID_ICH8DH		0x2812
 #define DEVICEID_ICH8DO		0x2814
 #define DEVICEID_ICH8M		0x2815
+#define DEVICEID_ICH8ME		0x2811
 #define DEVICEID_ICH9		0x2918
-#define DEVICEID_ICH9R		0x2916
 #define DEVICEID_ICH9DH		0x2912
 #define DEVICEID_ICH9DO		0x2914
+#define DEVICEID_ICH9M		0x2919
+#define DEVICEID_ICH9ME		0x2917
+#define DEVICEID_ICH9R		0x2916
+#define DEVICEID_ICH10		0x3a18
+#define DEVICEID_ICH10D		0x3a1a
+#define DEVICEID_ICH10DO	0x3a14
+#define DEVICEID_ICH10R		0x3a16
 
 /* ICH LPC Interface Bridge Registers (ICH5 and older) */
 #define ICH_GEN_STA		0xd4