svn commit: r207724 - stable/7/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Thu May  6 18:51:47 2010
New Revision: 207724
URL: http://svn.freebsd.org/changeset/base/207724

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

Modified:
  stable/7/sys/dev/mii/e1000phy.c
  stable/7/sys/dev/mii/miidevs
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Thu May  6 18:50:23 2010	(r207723)
+++ stable/7/sys/dev/mii/e1000phy.c	Thu May  6 18:51:47 2010	(r207724)
@@ -111,6 +111,7 @@ static const struct mii_phydesc e1000phy
 	MII_PHY_DESC(MARVELL, E1116),
 	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),
@@ -229,6 +230,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: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Thu May  6 18:50:23 2010	(r207723)
+++ stable/7/sys/dev/mii/miidevs	Thu May  6 18:51:47 2010	(r207724)
@@ -243,6 +243,7 @@ model MARVELL E1111		0x000c Marvell 88E1
 model MARVELL E1116		0x0021 Marvell 88E1116 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