diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-26 20:33:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-26 20:34:07 +0200 |
| commit | b43bd72835a5f7adef81fe53fa1fbe7b0e43df8e (patch) | |
| tree | 5e730b47c0dccece6947165ac43edddbdfa71cdd /drivers/net/phy/micrel.c | |
| parent | net: phy: fix auto-negotiation stall due to unavailable interrupt (diff) | |
| download | linux-b43bd72835a5f7adef81fe53fa1fbe7b0e43df8e.tar.xz linux-b43bd72835a5f7adef81fe53fa1fbe7b0e43df8e.zip | |
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>
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 11 |
1 files changed, 0 insertions, 11 deletions
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; } |