svn commit: r187073 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Mon Jan 12 02:31:22 2009
New Revision: 187073
URL: http://svn.freebsd.org/changeset/base/187073

Log:
  MFC r183492,r184192
  
  r183492:
    Add Vitesse VSC8211 PHY which is found on Planex GU-1000T.
  
    HW donated by:	nork
  
  r184192:
    Correct PHY description and OUI of VSC8211. Previously VSC8211 was
    not recognized by ciphy(4) due to the incorrect OUI.
  
    Reported by:	nork
    Tested by:	nork

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/mii/ciphy.c
  stable/7/sys/dev/mii/miidevs

Modified: stable/7/sys/dev/mii/ciphy.c
==============================================================================
--- stable/7/sys/dev/mii/ciphy.c	Mon Jan 12 02:07:57 2009	(r187072)
+++ stable/7/sys/dev/mii/ciphy.c	Mon Jan 12 02:31:22 2009	(r187073)
@@ -91,6 +91,7 @@ static const struct mii_phydesc ciphys[]
 	MII_PHY_DESC(CICADA, CS8201),
 	MII_PHY_DESC(CICADA, CS8201A),
 	MII_PHY_DESC(CICADA, CS8201B),
+	MII_PHY_DESC(CICADA, VSC8211),
 	MII_PHY_DESC(VITESSE, VSC8601),
 	MII_PHY_END
 };
@@ -419,6 +420,7 @@ ciphy_fixup(struct mii_softc *sc)
 		}
 
 		break;
+	case MII_MODEL_CICADA_VSC8211:
 	case MII_MODEL_VITESSE_VSC8601:
 		break;
 	default:

Modified: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Mon Jan 12 02:07:57 2009	(r187072)
+++ stable/7/sys/dev/mii/miidevs	Mon Jan 12 02:31:22 2009	(r187073)
@@ -151,6 +151,7 @@ model BROADCOM2 BCM5906		0x0004 BCM5906 
 
 /* Cicada Semiconductor PHYs (now owned by Vitesse?) */
 model CICADA CS8201		0x0001 Cicada CS8201 10/100/1000TX PHY
+model CICADA VSC8211		0x000b Cicada VSC8211 10/100/1000TX PHY
 model CICADA CS8201A		0x0020 Cicada CS8201 10/100/1000TX PHY
 model CICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
 model VITESSE VSC8601		0x0002 Vitesse VSC8601 10/100/1000TX PHY