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

[Marius Strobl]

Author: marius
Date: Tue Aug 23 14:01:04 2011
New Revision: 225115
URL: http://svn.freebsd.org/changeset/base/225115

Log:
  MFC: r223688
  
  Add detection for the Marvel 88E1149R and treat it just like the
  88E1149.

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	Tue Aug 23 14:00:01 2011	(r225114)
+++ stable/7/sys/dev/mii/e1000phy.c	Tue Aug 23 14:01:04 2011	(r225115)
@@ -107,6 +107,7 @@ static const struct mii_phydesc e1000phy
 	MII_PHY_DESC(MARVELL, E1116),
 	MII_PHY_DESC(MARVELL, E1116R),
 	MII_PHY_DESC(MARVELL, E1118),
+	MII_PHY_DESC(MARVELL, E1149R),
 	MII_PHY_DESC(MARVELL, E3016),
 	MII_PHY_DESC(MARVELL, PHYG65G),
 	MII_PHY_DESC(xxMARVELL, E1000),
@@ -161,6 +162,7 @@ e1000phy_attach(device_t dev)
 			sc->mii_flags |= MIIF_HAVEFIBER;
 		break;
 	case MII_MODEL_MARVELL_E1149:
+	case MII_MODEL_MARVELL_E1149R:
 		/*
 		 * Some 88E1149 PHY's page select is initialized to
 		 * point to other bank instead of copper/fiber bank
@@ -224,6 +226,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_E1149R:
 		case MII_MODEL_MARVELL_PHYG65G:
 			/* Disable energy detect mode. */
 			reg &= ~E1000_SCR_EN_DETECT_MASK;
@@ -256,7 +259,8 @@ e1000phy_reset(struct mii_softc *sc)
 		PHY_WRITE(sc, E1000_SCR, reg);
 
 		if (esc->mii_model == MII_MODEL_MARVELL_E1116 ||
-		    esc->mii_model == MII_MODEL_MARVELL_E1149) {
+		    esc->mii_model == MII_MODEL_MARVELL_E1149 ||
+		    esc->mii_model == MII_MODEL_MARVELL_E1149R) {
 			PHY_WRITE(sc, E1000_EADR, 2);
 			reg = PHY_READ(sc, E1000_SCR);
 			reg |= E1000_SCR_RGMII_POWER_UP;

Modified: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Tue Aug 23 14:00:01 2011	(r225114)
+++ stable/7/sys/dev/mii/miidevs	Tue Aug 23 14:01:04 2011	(r225115)
@@ -249,6 +249,7 @@ model MARVELL E1111		0x000c Marvell 88E1
 model MARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 model MARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY
 model MARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
+model MARVELL E1149R		0x0025 Marvell 88E1149R Quad 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