| From 966c476ad2b363ea14edb8e9050412b875397774 Mon Sep 17 00:00:00 2001 |
| From: "David S. Miller" <davem@davemloft.net> |
| Date: Wed, 26 Apr 2017 14:33:14 -0400 |
| Subject: [PATCH 105/255] 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> |
| (cherry picked from commit b43bd72835a5f7adef81fe53fa1fbe7b0e43df8e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/phy/micrel.c | 11 ----------- |
| 1 file changed, 11 deletions(-) |
| |
| --- a/drivers/net/phy/micrel.c |
| +++ b/drivers/net/phy/micrel.c |
| @@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy |
| 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; |
| } |
| |
