From c0b989c4c58de08b00957d34448e43ea2bde4b9a Mon Sep 17 00:00:00 2001
From: Jason Wright <jason@cvs.openbsd.org>
Date: Wed, 17 Dec 2003 17:26:21 +0000
Subject: marvell skv2 (smc9452TX); from freebsd

---
 sys/dev/pci/if_sk.c        |  3 ++-
 sys/dev/pci/pcidevs.h      |  6 +++++-
 sys/dev/pci/pcidevs_data.h | 10 +++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'sys/dev/pci')

diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 4958d5d22f6..ef5fa715255 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.35 2003/12/17 16:53:46 jason Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.36 2003/12/17 17:26:20 jason Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -215,6 +215,7 @@ const struct pci_matchid skc_devices[] = {
 	{ PCI_VENDOR_DLINK,		PCI_PRODUCT_DLINK_DGE530T},
 	{ PCI_VENDOR_LINKSYS,		PCI_PRODUCT_LINKSYS_EG1032},
 	{ PCI_VENDOR_LINKSYS,		PCI_PRODUCT_LINKSYS_EG1064},
+	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_SK_V2},
 	{ PCI_VENDOR_SCHNEIDERKOCH,	PCI_PRODUCT_SCHNEIDERKOCH_GE},
 	{ PCI_VENDOR_SCHNEIDERKOCH,	PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2},
 };
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index f27074852e6..907fbf970ad 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.699 2003/12/17 16:49:29 jason Exp 
+ *	OpenBSD: pcidevs,v 1.700 2003/12/17 17:25:22 jason Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -166,6 +166,7 @@
 #define	PCI_VENDOR_ACARD	0x1191		/* Acard */
 #define	PCI_VENDOR_ZEINET	0x1193		/* Zeinet */
 #define	PCI_VENDOR_OMEGA	0x119b		/* Omega Micro */
+#define	PCI_VENDOR_MARVELL	0x11ab		/* Marvell */
 #define	PCI_VENDOR_LITEON	0x11ad		/* Lite-On */
 #define	PCI_VENDOR_V3	0x11b0		/* V3 Semiconductor */
 #define	PCI_VENDOR_PINNACLE	0x11bd		/* Pinnacle Systems */
@@ -1476,6 +1477,9 @@
 /* Martin-Marietta */
 #define	PCI_PRODUCT_MARTINMARIETTA_I740	0x00d1		/* i740 PCI */
 
+/* Marvell products */
+#define	PCI_PRODUCT_MARVELL_SK_V2	0x4320		/* SKv2 */
+
 /* Matrox products */
 #define	PCI_PRODUCT_MATROX_ATLAS	0x0518		/* MGA PX2085 (Atlas) */
 #define	PCI_PRODUCT_MATROX_MILLENIUM	0x0519		/* MGA Millenium 2064W (Storm) */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 3c2d34b84b2..4ab09da3d67 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.699 2003/12/17 16:49:29 jason Exp 
+ *	OpenBSD: pcidevs,v 1.700 2003/12/17 17:25:22 jason Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -3954,6 +3954,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_MARTINMARIETTA, PCI_PRODUCT_MARTINMARIETTA_I740,
 	    "i740 PCI",
 	},
+	{
+	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2,
+	    "SKv2",
+	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_ATLAS,
 	    "MGA PX2085 (Atlas)",
@@ -7642,6 +7646,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	    PCI_VENDOR_OMEGA,
 	    "Omega Micro",
 	},
+	{
+	    PCI_VENDOR_MARVELL,
+	    "Marvell",
+	},
 	{
 	    PCI_VENDOR_LITEON,
 	    "Lite-On",
-- 
cgit v1.2.3