match on C610

diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c
index d53fa4b..7cf41e1 100644 (file)
--- a/sys/dev/pci/ichiic.c
+++ b/sys/dev/pci/ichiic.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ichiic.c,v 1.35 2014/09/23 13:29:30 jsg Exp $ */
+/*     $OpenBSD: ichiic.c,v 1.36 2015/01/09 07:29:45 jsg Exp $ */
 
 /*
  * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -114,6 +114,10 @@ const struct pci_matchid ichiic_ids[] = {
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_SMB_IDF_1 },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_SMB_IDF_2 },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_SMB_IDF_3 },
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_SMB },
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_MS_SMB_1 },
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_MS_SMB_2 },
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_MS_SMB_3 },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH8900_SMB },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_SMBUS }
 };

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 1201948..bb8eff4 100644 (file)
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pciide.c,v 1.350 2014/12/19 22:44:58 guenther Exp $   */
+/*     $OpenBSD: pciide.c,v 1.351 2015/01/09 07:29:45 jsg Exp $        */
 /*     $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $     */
 
 /*
@@ -561,6 +561,18 @@ const struct pciide_product_desc pciide_intel_products[] =  {
          0,
          piixsata_chip_map
        },
+       { PCI_PRODUCT_INTEL_C610_SATA_1, /* Intel C610 SATA */
+         0,
+         piixsata_chip_map
+       },
+       { PCI_PRODUCT_INTEL_C610_SATA_2, /* Intel C610 SATA */
+         0,
+         piixsata_chip_map
+       },
+       { PCI_PRODUCT_INTEL_C610_SATA_3, /* Intel C610 SATA */
+         0,
+         piixsata_chip_map
+       },
        { PCI_PRODUCT_INTEL_6SERIES_SATA_1, /* Intel 6 Series SATA */
          0,
          piixsata_chip_map