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

[Marius Strobl]

Author: marius
Date: Sun Oct 17 12:43:15 2010
New Revision: 213965
URL: http://svn.freebsd.org/changeset/base/213965

Log:
  MFC: r176773, r178598
  
  Recognize Cicada CS8204 and CS8244 PHYs.

Modified:
  stable/7/sys/dev/mii/ciphy.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/ciphy.c
==============================================================================
--- stable/7/sys/dev/mii/ciphy.c	Sun Oct 17 12:34:20 2010	(r213964)
+++ stable/7/sys/dev/mii/ciphy.c	Sun Oct 17 12:43:15 2010	(r213965)
@@ -34,7 +34,7 @@
 __FBSDID("$FreeBSD$");
 
 /*
- * Driver for the Cicada CS8201 10/100/1000 copper PHY.
+ * Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY.
  */
 
 #include <sys/param.h>
@@ -92,6 +92,8 @@ static const struct mii_phydesc ciphys[]
 	MII_PHY_DESC(CICADA, CS8201A),
 	MII_PHY_DESC(CICADA, CS8201B),
 	MII_PHY_DESC(CICADA, VSC8211),
+	MII_PHY_DESC(CICADA, CS8204),
+	MII_PHY_DESC(CICADA, CS8244),
 	MII_PHY_DESC(VITESSE, VSC8601),
 	MII_PHY_END
 };
@@ -384,6 +386,7 @@ ciphy_fixup(struct mii_softc *sc)
 	}
 
 	switch (model) {
+	case MII_MODEL_CICADA_CS8204:
 	case MII_MODEL_CICADA_CS8201:
 
 		/* Turn off "aux mode" (whatever that means) */
@@ -421,6 +424,7 @@ ciphy_fixup(struct mii_softc *sc)
 
 		break;
 	case MII_MODEL_CICADA_VSC8211:
+	case MII_MODEL_CICADA_CS8244:
 	case MII_MODEL_VITESSE_VSC8601:
 		break;
 	default:

Modified: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Sun Oct 17 12:34:20 2010	(r213964)
+++ stable/7/sys/dev/mii/miidevs	Sun Oct 17 12:43:15 2010	(r213965)
@@ -152,9 +152,11 @@ model BROADCOM2 BCM5906		0x0004 BCM5906 
 
 /* Cicada Semiconductor PHYs (now owned by Vitesse?) */
 model CICADA CS8201		0x0001 Cicada CS8201 10/100/1000TX PHY
+model CICADA CS8204		0x0004 Cicada CS8204 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 CICADA CS8244		0x002c Cicada CS8244 10/100/1000TX PHY
 model VITESSE VSC8601		0x0002 Vitesse VSC8601 10/100/1000TX PHY
 
 /* Davicom Semiconductor PHYs */