diff options
| author |   jsg <jsg@openbsd.org> | 2005-08-02 00:19:36 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2005-08-02 00:19:36 +0000 |
| commit | 46af88d67ab0968d20df54a662e65cdc23dcab99 (patch) | |
| tree | 33ff91d7db265689046e4216e659617072d87283 | |
| parent | make compile again (diff) | |
| download | wireguard-openbsd-46af88d67ab0968d20df54a662e65cdc23dcab99.tar.xz wireguard-openbsd-46af88d67ab0968d20df54a662e65cdc23dcab99.zip | |
Marvell 88E1111 from Dave Huang in NetBSD PR 30556.
ok brad@
| -rw-r--r-- | share/man/man4/eephy.4 | 6 | ||||
| -rw-r--r-- | sys/dev/mii/eephy.c | 4 | ||||
| -rw-r--r-- | sys/dev/mii/miidevs | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/share/man/man4/eephy.4 b/share/man/man4/eephy.4 index e544f8f6eb2..f65efb93a9d 100644 --- a/share/man/man4/eephy.4 +++ b/share/man/man4/eephy.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: eephy.4,v 1.12 2004/12/01 09:57:24 jmc Exp $ +.\" $OpenBSD: eephy.4,v 1.13 2005/08/02 00:21:32 jsg Exp $ .\" .\"Copyright (c) 2001 by Parag Patel. All rights reserved. .\" @@ -30,13 +30,13 @@ .Os .Sh NAME .Nm eephy -.Nd Marvell 88E1000/88E1011 Alaska Ethernet PHY driver +.Nd Marvell 88E1000/88E1011/88E1111 Alaska Ethernet PHY driver .Sh SYNOPSIS .Cd "eephy* at mii?" .Sh DESCRIPTION The .Nm -driver supports Marvell 88E1000 and 88E1011 10/100/1000 Ethernet PHYs. +driver supports Marvell 88E1000, 88E1011 and 88E1111 10/100/1000 Ethernet PHYs. .Sh SEE ALSO .Xr gem 4 , .Xr ifmedia 4 , diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 858aeccbc3e..24591232953 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.19 2005/07/22 11:48:10 brad Exp $ */ +/* $OpenBSD: eephy.c,v 1.20 2005/08/02 00:21:32 jsg Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -83,6 +83,8 @@ static const struct mii_phydesc eephys[] = { MII_STR_xxMARVELL_E1000_3 }, { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5, MII_STR_xxMARVELL_E1000_5 }, + { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111, + MII_STR_xxMARVELL_E1111 }, { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000, MII_STR_MARVELL_E1000 }, { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011, diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 21b93d554a9..4b806e61df7 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -1,4 +1,4 @@ -$OpenBSD: miidevs,v 1.58 2005/07/22 11:39:36 brad Exp $ +$OpenBSD: miidevs,v 1.59 2005/08/02 00:19:36 jsg Exp $ /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */ /*- @@ -161,6 +161,7 @@ model MARVELL E1000_7 0x000c Marvell 88E1000 Gigabit PHY model xxMARVELL E1000_2 0x0002 Marvell 88E1000 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY model xxMARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY +model xxMARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY /* Contrived vendor/model for dcphy */ model xxDEC xxDC 0x0001 DC |