summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-04 13:02:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-04 13:02:34 +0000
commit21b6747f2db8b4467a432182f4b76b3baf010e6b (patch)
tree5bbeb699130730de5bd8a677ebb794869b01ab29 /sys
parent1a23dfb6c1eec1438b52a177f190b747742a795a (diff)
davicom DM9601 contains another amiphy clone
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/mii/amphy.c5
-rw-r--r--sys/dev/mii/miidevs5
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 4a0b3409940..0d9170355f6 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amphy.c,v 1.8 2004/09/27 18:25:47 brad Exp $ */
+/* $OpenBSD: amphy.c,v 1.9 2004/10/04 13:02:33 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -88,6 +88,9 @@ amphymatch(struct device *parent, void *match, void *aux)
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_DAVICOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_DAVICOM_DM9102)
return(10);
+ if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_DAVICOM &&
+ MII_MODEL(ma->mii_id2) == MII_MODEL_DAVICOM_DM9601)
+ return(10);
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxALTIMA && /*XXX*/
MII_MODEL(ma->mii_id2) == MII_MODEL_AMD_79C875phy)
return(10);
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 8509eb1f94f..5342498e004 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.44 2004/10/01 19:05:19 brad Exp $
+$OpenBSD: miidevs,v 1.45 2004/10/04 13:02:33 deraadt Exp $
/* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
/*-
@@ -127,8 +127,9 @@ model BROADCOM BCM5201 0x0021 BCM5201 10/100 media interface
model BROADCOM_BCM4401 0x0036 BCM4401 10/100baseTX PHY
/* Davicom Semiconductor PHYs */
-model DAVICOM DM9102 0x0004 DM9102 10/100 media interface
model xxDAVICOM DM9101 0x0000 DM9101 10/100 media interface
+model DAVICOM DM9102 0x0004 DM9102 10/100 media interface
+model DAVICOM DM9601 0x000c DM9601 10/100 media interface
/* Enable Semiconductor PHYs */
model ENABLESEMI 88E1000 0x0005 Enable 88E1000