diff options
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 2e12f982534f..abb7876a8776 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -847,7 +847,6 @@ static int m88e1510_config_init(struct phy_device *phydev) | |||
| 847 | 847 | ||
| 848 | /* SGMII-to-Copper mode initialization */ | 848 | /* SGMII-to-Copper mode initialization */ |
| 849 | if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { | 849 | if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { |
| 850 | |||
| 851 | /* Select page 18 */ | 850 | /* Select page 18 */ |
| 852 | err = marvell_set_page(phydev, 18); | 851 | err = marvell_set_page(phydev, 18); |
| 853 | if (err < 0) | 852 | if (err < 0) |
| @@ -870,21 +869,6 @@ static int m88e1510_config_init(struct phy_device *phydev) | |||
| 870 | err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE); | 869 | err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE); |
| 871 | if (err < 0) | 870 | if (err < 0) |
| 872 | return err; | 871 | return err; |
| 873 | |||
| 874 | /* There appears to be a bug in the 88e1512 when used in | ||
| 875 | * SGMII to copper mode, where the AN advertisement register | ||
| 876 | * clears the pause bits each time a negotiation occurs. | ||
| 877 | * This means we can never be truely sure what was advertised, | ||
| 878 | * so disable Pause support. | ||
| 879 | */ | ||
| 880 | linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, | ||
| 881 | phydev->supported); | ||
| 882 | linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT, | ||
| 883 | phydev->supported); | ||
| 884 | linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, | ||
| 885 | phydev->advertising); | ||
| 886 | linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT, | ||
| 887 | phydev->advertising); | ||
| 888 | } | 872 | } |
| 889 | 873 | ||
| 890 | return m88e1318_config_init(phydev); | 874 | return m88e1318_config_init(phydev); |
