Skip to content

Commit

Permalink
net: phy: mscc: add missing shift for media operation mode selection
Browse files Browse the repository at this point in the history
This patch adds a missing shift for the media operation mode selection.
This does not fix the driver as the current operation mode (copper) has
a value of 0, but this wouldn't work for other modes.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Antoine Tenart authored and David S. Miller committed Feb 27, 2020
1 parent 92040c6 commit 1ac7b09
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/phy/mscc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2813,8 +2813,8 @@ static int vsc8584_config_init(struct phy_device *phydev)

val = phy_read(phydev, MSCC_PHY_EXT_PHY_CNTL_1);
val &= ~(MEDIA_OP_MODE_MASK | VSC8584_MAC_IF_SELECTION_MASK);
val |= MEDIA_OP_MODE_COPPER | (VSC8584_MAC_IF_SELECTION_SGMII <<
VSC8584_MAC_IF_SELECTION_POS);
val |= (MEDIA_OP_MODE_COPPER << MEDIA_OP_MODE_POS) |
(VSC8584_MAC_IF_SELECTION_SGMII << VSC8584_MAC_IF_SELECTION_POS);
ret = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, val);

ret = genphy_soft_reset(phydev);
Expand Down Expand Up @@ -3276,7 +3276,7 @@ static int vsc8514_config_init(struct phy_device *phydev)
return ret;

ret = phy_modify(phydev, MSCC_PHY_EXT_PHY_CNTL_1, MEDIA_OP_MODE_MASK,
MEDIA_OP_MODE_COPPER);
MEDIA_OP_MODE_COPPER << MEDIA_OP_MODE_POS);

if (ret)
return ret;
Expand Down

0 comments on commit 1ac7b09

Please sign in to comment.