diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-03-16 12:47:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-03-16 12:47:36 +0000 |
| commit | 3a1e014ef30c35b330436bf3677f52aeaf50d11d (patch) | |
| tree | aece29f567d3f318fbdb34c89e31233e950f80b4 /sys/dev | |
| parent | c108b2a602129191bca61c9c8df77578c442d80f (diff) | |
88E8057 is a Yukon 2 Ultra 2, and this might make it work on a little
shiny green box in Japan
ok kettenis
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 9345c00f42a..5ae87ca0740 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.69 2009/02/22 16:40:13 kettenis Exp $ */ +/* $OpenBSD: if_msk.c,v 1.70 2009/03/16 12:47:35 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -221,6 +221,7 @@ const struct pci_matchid mskc_devices[] = { { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8071 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8072 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8075 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8057 }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx } }; @@ -939,6 +940,7 @@ msk_probe(struct device *parent, void *match, void *aux) case SK_YUKON_FE: case SK_YUKON_FE_P: case SK_YUKON_SUPR: + case SK_YUKON_ULTRA2: return (1); } @@ -1156,7 +1158,7 @@ mskcprint(void *aux, const char *pnp) struct skc_attach_args *sa = aux; if (pnp) - printf("sk port %c at %s", + printf("msk port %c at %s", (sa->skc_port == SK_PORT_A) ? 'A' : 'B', pnp); else printf(" port %c", (sa->skc_port == SK_PORT_A) ? 'A' : 'B'); @@ -1318,6 +1320,9 @@ mskc_attach(struct device *parent, struct device *self, void *aux) case SK_YUKON_SUPR: sc->sk_name = "Yukon-2 Supreme"; break; + case SK_YUKON_ULTRA2: + sc->sk_name = "Yukon-2 Ultra2"; + break; default: sc->sk_name = "Yukon (Unknown)"; } diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index b1d815c2700..a97aaaa7a5b 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.50 2008/10/20 03:54:33 brad Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.51 2009/03/16 12:47:35 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -352,13 +352,14 @@ #define SK_YUKON_FE 0xB7 #define SK_YUKON_FE_P 0xB8 #define SK_YUKON_SUPR 0xB9 +#define SK_YUKON_ULTRA2 0xBA #define SK_IS_GENESIS(sc) \ ((sc)->sk_type == SK_GENESIS) #define SK_IS_YUKON(sc) \ ((sc)->sk_type >= SK_YUKON && (sc)->sk_type <= SK_YUKON_LP) #define SK_IS_YUKON2(sc) \ - ((sc)->sk_type >= SK_YUKON_XL && (sc)->sk_type <= SK_YUKON_SUPR) + ((sc)->sk_type >= SK_YUKON_XL && (sc)->sk_type <= SK_YUKON_ULTRA2) /* Known revisions in SK_CONFIG */ #define SK_YUKON_LITE_REV_A0 0x0 /* invented, see test in skc_attach */ diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 98e9f2a7b2d..089242e4d61 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1462 2009/03/16 12:37:43 jsg Exp $ +$OpenBSD: pcidevs,v 1.1463 2009/03/16 12:47:35 deraadt Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -3181,6 +3181,7 @@ product MARVELL YUKON_8071 0x436b Yukon 88E8071 product MARVELL YUKON_8072 0x436c Yukon 88E8072 product MARVELL YUKON_8055_2 0x436d Yukon 88E8055 product MARVELL YUKON_8075 0x4370 Yukon 88E8075 +product MARVELL YUKON_8057 0x4380 Yukon 88E8057 product MARVELL YUKON_BELKIN 0x5005 Yukon (Belkin F5D5005) product MARVELL 88SX5040 0x5040 88SX5040 SATA product MARVELL 88SX5041 0x5041 88SX5041 SATA |