diff options
| author | Antoine Tenart <antoine.tenart@bootlin.com> | 2020-02-26 15:40:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-26 20:51:42 -0800 |
| commit | 1ac7b090ec4618a339afa6d25ab4033c57b30a28 (patch) | |
| tree | 32d6cb5435c9f4c47d767f8e303fdbc7ecae1106 /drivers/net/phy/mscc.c | |
| parent | 92040c6daaa46027c2d11aab0a5366ab667c5358 (diff) | |
net: phy: mscc: add missing shift for media operation mode selection
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>
Diffstat (limited to 'drivers/net/phy/mscc.c')
| -rw-r--r-- | drivers/net/phy/mscc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index 937ac7da2789..880425466bc8 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -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); @@ -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; |