svn commit: r207046 - stable/8/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Thu Apr 22 01:39:45 2010
New Revision: 207046
URL: http://svn.freebsd.org/changeset/base/207046

Log:
  MFC r206563:
    Add Agere ET1011 PHY which is found on Belkin F5D5055 USB
    controller. Unlike Agere ET1011C, Agere ET1011 does not seem to
    need special DSP programming to workaround silicon bug.

Modified:
  stable/8/sys/dev/mii/miidevs
  stable/8/sys/dev/mii/truephy.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/mii/miidevs
==============================================================================
--- stable/8/sys/dev/mii/miidevs	Thu Apr 22 01:12:28 2010	(r207045)
+++ stable/8/sys/dev/mii/miidevs	Thu Apr 22 01:39:45 2010	(r207046)
@@ -109,6 +109,7 @@ oui xxREALTEK			0x000732
  */
 
 /* Agere Systems PHYs */
+model AGERE ET1011		0x0001 ET1011 10/100/1000baseT PHY
 model AGERE ET1011C		0x0004 ET1011C 10/100/1000baseT PHY
 
 /* Altima Communications PHYs */

Modified: stable/8/sys/dev/mii/truephy.c
==============================================================================
--- stable/8/sys/dev/mii/truephy.c	Thu Apr 22 01:12:28 2010	(r207045)
+++ stable/8/sys/dev/mii/truephy.c	Thu Apr 22 01:39:45 2010	(r207046)
@@ -76,6 +76,7 @@ static device_method_t truephy_methods[]
 };
 
 static const struct mii_phydesc truephys[] = {
+	MII_PHY_DESC(AGERE,	ET1011),
 	MII_PHY_DESC(AGERE,	ET1011C),
 	MII_PHY_END
 };
@@ -161,7 +162,10 @@ truephy_attach(device_t dev)
 
 	mii->mii_instance++;
 
-	truephy_reset(sc);
+	if (MII_MODEL(ma->mii_id2) == MII_MODEL_AGERE_ET1011)
+		mii_phy_reset(sc);
+	else
+		truephy_reset(sc);
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	if (sc->mii_capabilities & BMSR_EXTSTAT) {