diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
| commit | 3bfd12008bef1a8353e7ceaca2cb06cf388527ed (patch) | |
| tree | ac25e8db2f18bcba9f48518249fc020a05cb576c /drivers/net/phy/marvell.c | |
| parent | 6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72 (diff) | |
| parent | d6da3dbaef57fc1d319b6b552efa009e2489d7d9 (diff) | |
Merge branch 'next'
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b0a0b7fcb38..08608a99b9d 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -461,8 +461,7 @@ static int m88e151x_config(struct phy_device *phydev) reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_88E151x_PHY_MSCR); reg &= ~MIIM_88E151x_RGMII_RXTX_DELAY; - if (phydev->interface == PHY_INTERFACE_MODE_RGMII || - phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) reg |= MIIM_88E151x_RGMII_RXTX_DELAY; else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) reg |= MIIM_88E151x_RGMII_RX_DELAY; |