aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2018-09-29 17:04:15 -0400
committerDavid S. Miller <davem@davemloft.net>2018-10-02 01:55:36 -0400
commitd0939c26c53a2b2cecfbe6953858a58abb0158c7 (patch)
treec0e5cdf2a41102023c57ed8da7eac3069203cce6
parentf954a04ea18ebfcba1cd2756eaee59eb4978a20e (diff)
net: ethernet: xgbe: expand PHY_GBIT_FEAUTRES
The macro PHY_GBIT_FEAUTRES needs to change into a bitmap in order to support link_modes. Remove its use from xgde by replacing it with its definition. Probably, the current behavior is wrong. It probably should be ANDing not assigning. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index a7e03e3ecc93..151bdb629e8a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -878,8 +878,9 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)
878 phy_write(phy_data->phydev, 0x04, 0x0d01); 878 phy_write(phy_data->phydev, 0x04, 0x0d01);
879 phy_write(phy_data->phydev, 0x00, 0x9140); 879 phy_write(phy_data->phydev, 0x00, 0x9140);
880 880
881 phy_data->phydev->supported = PHY_GBIT_FEATURES; 881 phy_data->phydev->supported = PHY_10BT_FEATURES |
882 phy_data->phydev->advertising = phy_data->phydev->supported; 882 PHY_100BT_FEATURES |
883 PHY_1000BT_FEATURES;
883 phy_support_asym_pause(phy_data->phydev); 884 phy_support_asym_pause(phy_data->phydev);
884 885
885 netif_dbg(pdata, drv, pdata->netdev, 886 netif_dbg(pdata, drv, pdata->netdev,
@@ -950,8 +951,9 @@ static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)
950 reg = phy_read(phy_data->phydev, 0x00); 951 reg = phy_read(phy_data->phydev, 0x00);
951 phy_write(phy_data->phydev, 0x00, reg & ~0x00800); 952 phy_write(phy_data->phydev, 0x00, reg & ~0x00800);
952 953
953 phy_data->phydev->supported = PHY_GBIT_FEATURES; 954 phy_data->phydev->supported = (PHY_10BT_FEATURES |
954 phy_data->phydev->advertising = phy_data->phydev->supported; 955 PHY_100BT_FEATURES |
956 PHY_1000BT_FEATURES);
955 phy_support_asym_pause(phy_data->phydev); 957 phy_support_asym_pause(phy_data->phydev);
956 958
957 netif_dbg(pdata, drv, pdata->netdev, 959 netif_dbg(pdata, drv, pdata->netdev,