Commit b43bd728 authored by David S. Miller's avatar David S. Miller

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

This reverts commit 99f81afc.

It was papering over the real problem, which is fixed by commit
f555f34f ("net: phy: fix auto-negotiation stall due to unavailable
interrupt")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f555f34f
...@@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy_device *phydev) ...@@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy_device *phydev)
if (priv->led_mode >= 0) if (priv->led_mode >= 0)
kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode); 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment