diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-10-15 23:09:18 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-10-15 23:09:18 +0000 |
| commit | 279bbf31701028d14e8aee0c36a1287df4f6e43d (patch) | |
| tree | 7484cce8eefc3a66535d25312a0501c498d1ce68 | |
| parent | b548d39856bf97d874966539704357fd20b21787 (diff) | |
add 2 new Yukon PCI ids and recognize Yukon-2 EC Ultra ASIC.
| -rw-r--r-- | sys/dev/pci/if_sk.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 6ebb0bf2b03..05d7e880088 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.84 2005/10/15 23:07:09 brad Exp $ */ +/* $OpenBSD: if_sk.c,v 1.85 2005/10/15 23:09:17 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -228,6 +228,8 @@ const struct pci_matchid skc_devices[] = { { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_6 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_7 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_9 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_10 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052 }, @@ -1102,6 +1104,7 @@ sk_probe(struct device *parent, void *match, void *aux) case SK_YUKON_LP: #ifdef not_quite_yet case SK_YUKON_XL: + case SK_YUKON_EC_U: case SK_YUKON_EC: case SK_YUKON_FE: #endif @@ -1275,6 +1278,7 @@ sk_attach(struct device *parent, struct device *self, void *aux) case SK_YUKON_LITE: case SK_YUKON_LP: case SK_YUKON_XL: + case SK_YUKON_EC_U: case SK_YUKON_EC: case SK_YUKON_FE: sk_init_yukon(sc_if); @@ -1550,6 +1554,9 @@ skc_attach(struct device *parent, struct device *self, void *aux) case SK_YUKON_XL: sc->sk_name = "Marvell Yukon-2 XL"; break; + case SK_YUKON_EC_U: + sc->sk_name = "Marvell Yukon-2 EC Ultra"; + break; case SK_YUKON_EC: sc->sk_name = "Marvell Yukon-2 EC"; break; diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index 9b78555e803..32df2c2bd0f 100644 --- a/sys/dev/pci/if_skreg.h +++ b/sys/dev/pci/if_skreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_skreg.h,v 1.23 2005/09/20 01:02:22 brad Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.24 2005/10/15 23:09:17 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -315,6 +315,7 @@ #define SK_YUKON_LITE 0xB1 #define SK_YUKON_LP 0xB2 #define SK_YUKON_XL 0xB3 +#define SK_YUKON_EC_U 0xB4 #define SK_YUKON_EC 0xB6 #define SK_YUKON_FE 0xB7 |