diff options
| author | Kevin Lo <kevlo@cvs.openbsd.org> | 2010-11-23 06:59:28 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@cvs.openbsd.org> | 2010-11-23 06:59:28 +0000 |
| commit | a273b1a2da32b444bd4c89fb4b2eb01b25795396 (patch) | |
| tree | 71722795a65885dca4047c375918945bfe862c81 /sys | |
| parent | 6c3fd4be2069e04c665d400d35dacfeb3188cd98 (diff) | |
Recognize the Marvell PHYG65G Gig PHY; tested by Frans Haarman
From FreeBSD
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mii/eephy.c | 5 | ||||
| -rw-r--r-- | sys/dev/mii/miidevs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 52b15707927..aed74438f86 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.49 2009/11/24 15:54:07 kettenis Exp $ */ +/* $OpenBSD: eephy.c,v 1.50 2010/11/23 06:59:27 kevlo Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -107,6 +107,8 @@ static const struct mii_phydesc eephys[] = { MII_STR_MARVELL_E3016}, { MII_OUI_MARVELL, MII_MODEL_MARVELL_E3082, MII_STR_MARVELL_E3082 }, + { MII_OUI_MARVELL, MII_MODEL_MARVELL_PHYG65G, + MII_STR_MARVELL_PHYG65G }, { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5, MII_STR_xxMARVELL_E1000_5 }, { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_6, @@ -252,6 +254,7 @@ eephy_init(struct mii_softc *sc) case MII_MODEL_MARVELL_E1011: case MII_MODEL_MARVELL_E1111: case MII_MODEL_MARVELL_E1112: + case MII_MODEL_MARVELL_PHYG65G: reg &= ~E1000_SCR_EN_DETECT_MASK; break; } diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 607b14da335..e59a0d8c706 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -1,4 +1,4 @@ -$OpenBSD: miidevs,v 1.113 2010/03/26 01:33:31 sthen Exp $ +$OpenBSD: miidevs,v 1.114 2010/11/23 06:59:27 kevlo Exp $ /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */ /*- @@ -249,6 +249,7 @@ model MARVELL E1116 0x0021 88E1116 Gigabit PHY model MARVELL E1118 0x0022 88E1118 Gigabit PHY model MARVELL E1116R 0x0024 88E1116R Gigabit PHY model MARVELL E3016 0x0026 88E3016 10/100 PHY +model MARVELL PHYG65G 0x0027 PHYG65G Gigabit PHY /* Myson PHYs */ model MYSON MTD972 0x0000 MTD972 10/100 PHY |