summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-02-10 22:49:47 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-02-10 22:49:47 +0000
commit7592b3246f60523207d7ae4d1e533b83d961a57f (patch)
treeeab7d12b06d0d49864bb01df29a7e15e9bbeae64 /sys
parentc7979e8b63d214966dc75ff4c1563e30950fb323 (diff)
Add preliminary support for Marvell Yukon-II Extreme chips.
Based on a diff from brad@.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_msk.c6
-rw-r--r--sys/dev/pci/if_skreg.h3
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 7aad083258c..7f55fc9e9f9 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.44 2007/02/10 02:27:56 krw Exp $ */
+/* $OpenBSD: if_msk.c,v 1.45 2007/02/10 22:49:46 kettenis Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -950,6 +950,7 @@ msk_probe(struct device *parent, void *match, void *aux)
switch (sa->skc_type) {
case SK_YUKON_XL:
case SK_YUKON_EC_U:
+ case SK_YUKON_EX:
case SK_YUKON_EC:
case SK_YUKON_FE:
return (1);
@@ -1280,6 +1281,9 @@ mskc_attach(struct device *parent, struct device *self, void *aux)
case SK_YUKON_EC_U:
sc->sk_name = "Yukon-2 EC Ultra";
break;
+ case SK_YUKON_EX:
+ sc->sk_name = "Yukon-2 Extreme";
+ break;
case SK_YUKON_EC:
sc->sk_name = "Yukon-2 EC";
break;
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h
index a6d69faaa1d..1ba00a23bce 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.42 2007/02/10 02:27:56 krw Exp $ */
+/* $OpenBSD: if_skreg.h,v 1.43 2007/02/10 22:49:46 kettenis Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -347,6 +347,7 @@
#define SK_YUKON_LP 0xB2
#define SK_YUKON_XL 0xB3
#define SK_YUKON_EC_U 0xB4
+#define SK_YUKON_EX 0xB5
#define SK_YUKON_EC 0xB6
#define SK_YUKON_FE 0xB7