From c8c97192a623f6aaf05ef5a2950eb6091ef8fb20 Mon Sep 17 00:00:00 2001
From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Fri, 16 Jul 2004 13:08:46 +0000
Subject: [PATCH] Add detection support for the Intel ICH6 chipset.

---
 sys/dev/disk/ata/ata-dma.c |  5 ++++-
 sys/dev/disk/ata/ata-pci.c | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys/dev/disk/ata/ata-dma.c b/sys/dev/disk/ata/ata-dma.c
index 91c0c53d68..5efb596416 100644
--- a/sys/dev/disk/ata/ata-dma.c
+++ b/sys/dev/disk/ata/ata-dma.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.35.2.31 2003/05/07 16:46:11 jhb Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.23 2004/06/23 16:15:24 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.24 2004/07/16 13:08:46 asmodai Exp $
  */
 
 #include <sys/param.h>
@@ -147,6 +147,9 @@ ata_dmainit(struct ata_device *atadev, int apiomode, int wdmamode, int udmamode)
 #endif
     switch (chiptype) {
 
+    case 0x266f8086:	/* Intel ICH6 ATA */
+    case 0x26528086:	/* Intel ICH6R/RW SATA */
+    case 0x26518086:	/* Intel ICH6/W SATA */
     case 0x24db8086:	/* Intel ICH5 */
     case 0x24d18086:	/* Intel ICH5 SATA */
     case 0x24ca8086:	/* Intel ICH4 mobile */
diff --git a/sys/dev/disk/ata/ata-pci.c b/sys/dev/disk/ata/ata-pci.c
index 4141ac570a..8742c33c92 100644
--- a/sys/dev/disk/ata/ata-pci.c
+++ b/sys/dev/disk/ata/ata-pci.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.32.2.15 2003/06/06 13:27:05 fjoe Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.15 2004/06/23 06:53:13 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.16 2004/07/16 13:08:46 asmodai Exp $
  */
 
 #include <sys/param.h>
@@ -157,6 +157,15 @@ ata_pci_match(device_t dev)
     case 0x24db8086:
 	return "Intel ICH5 ATA100 controller";
 
+    case 0x26518086:
+	return "Intel ICH6/W SATA150 controller";
+
+    case 0x26528086:
+	return "Intel ICH6R/RW SATA150 controller";
+
+    case 0x266f8086:
+	return "Intel ICH6R/RW ATA100 controller";
+
     case 0x522910b9:
 	if (pci_get_revid(dev) >= 0xc4)
 	    return "AcerLabs Aladdin ATA100 controller";
-- 
2.41.0