From 1fd8af94a7a936a6b2014ab0ab10009f5346dddc Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 2 Nov 2009 14:31:11 +0000
Subject: [PATCH] --- yaml --- r: 171133 b: refs/heads/master c:
 cdd4e09d692bd4f3457b3789279005e112b7696d h: refs/heads/master i:   171131:
 ceb0bb2d2ab004cf6001cdd80be62a6e28b1cb3c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/phy/broadcom.c | 8 +++++---
 trunk/drivers/net/tg3.c          | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f10754ef3e70..63b0be5d74ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63a14ce449dd6d647de2725809159eb072b2c44f
+refs/heads/master: cdd4e09d692bd4f3457b3789279005e112b7696d
diff --git a/trunk/drivers/net/phy/broadcom.c b/trunk/drivers/net/phy/broadcom.c
index 5d2a2e90aba8..bddf4a42ae68 100644
--- a/trunk/drivers/net/phy/broadcom.c
+++ b/trunk/drivers/net/phy/broadcom.c
@@ -561,9 +561,11 @@ static int brcm_fet_config_init(struct phy_device *phydev)
 	if (err < 0)
 		goto done;
 
-	/* Enable auto power down */
-	err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
-				       MII_BRCM_FET_SHDW_AS2_APDE);
+	if (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE) {
+		/* Enable auto power down */
+		err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
+					       MII_BRCM_FET_SHDW_AS2_APDE);
+	}
 
 done:
 	/* Disable shadow register access */
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index e7128f6ae2d8..592b5bf09e40 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -1114,6 +1114,7 @@ static int tg3_mdio_init(struct tg3 *tp)
 	case TG3_PHY_ID_RTL8201E:
 	case TG3_PHY_ID_BCMAC131:
 		phydev->interface = PHY_INTERFACE_MODE_MII;
+		phydev->dev_flags |= PHY_BRCM_AUTO_PWRDWN_ENABLE;
 		tp->tg3_flags3 |= TG3_FLG3_PHY_IS_FET;
 		break;
 	}