svn commit: r207446 - head/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Fri Apr 30 19:01:55 2010
New Revision: 207446
URL: http://svn.freebsd.org/changeset/base/207446

Log:
  Add Marvell PHYG65G Gigabit PHY which is found on 88E8059 Yukon Optima.
  
  Tested by:	James LaLagna < jameslalagna <> gmail dot com >
  MFC after:	5 days

Modified:
  head/sys/dev/mii/e1000phy.c
  head/sys/dev/mii/miidevs

Modified: head/sys/dev/mii/e1000phy.c
==============================================================================
--- head/sys/dev/mii/e1000phy.c	Fri Apr 30 18:58:55 2010	(r207445)
+++ head/sys/dev/mii/e1000phy.c	Fri Apr 30 19:01:55 2010	(r207446)
@@ -112,6 +112,7 @@ static const struct mii_phydesc e1000phy
 	MII_PHY_DESC(MARVELL, E1116R),
 	MII_PHY_DESC(MARVELL, E1118),
 	MII_PHY_DESC(MARVELL, E3016),
+	MII_PHY_DESC(MARVELL, PHYG65G),
 	MII_PHY_DESC(xxMARVELL, E1000),
 	MII_PHY_DESC(xxMARVELL, E1011),
 	MII_PHY_DESC(xxMARVELL, E1000_3),
@@ -230,6 +231,7 @@ e1000phy_reset(struct mii_softc *sc)
 		case MII_MODEL_MARVELL_E1116:
 		case MII_MODEL_MARVELL_E1118:
 		case MII_MODEL_MARVELL_E1149:
+		case MII_MODEL_MARVELL_PHYG65G:
 			/* Disable energy detect mode. */
 			reg &= ~E1000_SCR_EN_DETECT_MASK;
 			reg |= E1000_SCR_AUTO_X_MODE;

Modified: head/sys/dev/mii/miidevs
==============================================================================
--- head/sys/dev/mii/miidevs	Fri Apr 30 18:58:55 2010	(r207445)
+++ head/sys/dev/mii/miidevs	Fri Apr 30 19:01:55 2010	(r207446)
@@ -247,6 +247,7 @@ model MARVELL E1116		0x0021 Marvell 88E1
 model MARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY
 model MARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model MARVELL E3016		0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY
+model MARVELL PHYG65G		0x0027 Marvell PHYG65G Gigabit PHY
 model xxMARVELL E1000		0x0005 Marvell 88E1000 Gigabit PHY
 model xxMARVELL E1011		0x0002 Marvell 88E1011 Gigabit PHY
 model xxMARVELL E1000_3		0x0003 Marvell 88E1000 Gigabit PHY