summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormanu <manu@NetBSD.org>2007-10-22 14:59:37 +0000
committermanu <manu@NetBSD.org>2007-10-22 14:59:37 +0000
commit818aeac0ffc1eeed95ff5cc8122f2ef4c683b14d (patch)
tree43816ee2c0da6f073b4add99d23d8505aafa698e /sys/dev
parentdcf90eeb823c30ebf1f305fbefb44cde712aa41b (diff)
Add support for Marvell 88CO55. Newer iMacs come with that chip.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_msk.c3
-rw-r--r--sys/dev/pci/pcidevs3
-rw-r--r--sys/dev/pci/pcidevs.h3
-rw-r--r--sys/dev/pci/pcidevs_data.h8
4 files changed, 12 insertions, 5 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index ea0e5f2ed17..314a369e510 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.10 2007/07/19 22:04:22 dsl Exp $ */
+/* $NetBSD: if_msk.c,v 1.11 2007/10/22 14:59:39 manu Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -167,6 +167,7 @@ static const struct msk_product {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C034 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C042 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_CO55 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 2c15f337d0a..4983d1b72f6 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.906 2007/10/22 10:33:03 nisimura Exp $
+$NetBSD: pcidevs,v 1.907 2007/10/22 14:59:38 manu Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1858,6 +1858,7 @@ product MARVELL YUKON_C036 0x4366 Yukon 88EC036
product MARVELL YUKON_C032 0x4367 Yukon 88EC032
product MARVELL YUKON_C034 0x4368 Yukon 88EC034
product MARVELL YUKON_C042 0x4369 Yukon 88EC042
+product MARVELL YUKON_CO55 0x436a Yukon 88ECO55
product MARVELL GT64120 0x4620 GT-64120 System Controller
product MARVELL BELKIN 0x5005 Belkin Gigabit Ethernet
product MARVELL 88SX5040 0x5040 88SX5040 SATA
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index a6c9d95b0cd..05f6f0607a2 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs.h,v 1.906 2007/10/22 10:35:15 nisimura Exp $ */
+/* $NetBSD: pcidevs.h,v 1.907 2007/10/22 14:59:38 manu Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1865,6 +1865,7 @@
#define PCI_PRODUCT_MARVELL_YUKON_C032 0x4367 /* Yukon 88EC032 */
#define PCI_PRODUCT_MARVELL_YUKON_C034 0x4368 /* Yukon 88EC034 */
#define PCI_PRODUCT_MARVELL_YUKON_C042 0x4369 /* Yukon 88EC042 */
+#define PCI_PRODUCT_MARVELL_YUKON_CO55 0x436a /* Yukon 88ECO55 */
#define PCI_PRODUCT_MARVELL_GT64120 0x4620 /* GT-64120 System Controller */
#define PCI_PRODUCT_MARVELL_BELKIN 0x5005 /* Belkin Gigabit Ethernet */
#define PCI_PRODUCT_MARVELL_88SX5040 0x5040 /* 88SX5040 SATA */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 18da47065a1..195eda64ba1 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs_data.h,v 1.905 2007/10/22 10:35:15 nisimura Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.906 2007/10/22 14:59:39 manu Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -6452,6 +6452,10 @@ static const struct pci_product pci_products[] = {
"Yukon 88EC042",
},
{
+ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_CO55,
+ "Yukon 88ECO55",
+ },
+ {
PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64120,
"GT-64120 System Controller",
},
@@ -13560,4 +13564,4 @@ static const struct pci_product pci_products[] = {
"Video Controller",
},
};
-const int pci_nproducts = 2792;
+const int pci_nproducts = 2793;