Skip to content

Commit b43bd72

Browse files
committed
Revert "phy: micrel: Disable auto negotiation on startup"
This reverts commit 99f81af. It was papering over the real problem, which is fixed by commit f555f34 ("net: phy: fix auto-negotiation stall due to unavailable interrupt") Signed-off-by: David S. Miller <[email protected]>
1 parent f555f34 commit b43bd72

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

drivers/net/phy/micrel.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy_device *phydev)
297297
if (priv->led_mode >= 0)
298298
kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode);
299299

300-
if (phy_interrupt_is_valid(phydev)) {
301-
int ctl = phy_read(phydev, MII_BMCR);
302-
303-
if (ctl < 0)
304-
return ctl;
305-
306-
ret = phy_write(phydev, MII_BMCR, ctl & ~BMCR_ANENABLE);
307-
if (ret < 0)
308-
return ret;
309-
}
310-
311300
return 0;
312301
}
313302

0 commit comments

Comments
 (0)