From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Apr 2017 18:33:14 +0000 (-0400)
Subject: Revert "phy: micrel: Disable auto negotiation on startup"
X-Git-Tag: MMI-PSA29.97-13-9~5776^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b43bd72835a5f7adef81fe53fa1fbe7b0e43df8e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Revert "phy: micrel: Disable auto negotiation on startup"

This reverts commit 99f81afc139c6edd14d77a91ee91685a414a1c66.

It was papering over the real problem, which is fixed by commit
f555f34fdc58 ("net: phy: fix auto-negotiation stall due to unavailable
interrupt")

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 1326d99771c1..da5b39268370 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy_device *phydev)
 	if (priv->led_mode >= 0)
 		kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode);
 
-	if (phy_interrupt_is_valid(phydev)) {
-		int ctl = phy_read(phydev, MII_BMCR);
-
-		if (ctl < 0)
-			return ctl;
-
-		ret = phy_write(phydev, MII_BMCR, ctl & ~BMCR_ANENABLE);
-		if (ret < 0)
-			return ret;
-	}
-
 	return 0;
 }