| Message ID | 20210427094831.545521-3-sr@denx.de |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/4] arm: mvebu: armada-3720-uDPU.dts: Change back to phy-mode "2500base-x" | expand |
On Tue, Apr 27, 2021 at 12:49 PM Stefan Roese <sr@denx.de> wrote: > > As was discussed on the list, PHY_INTERFACE_MODE_SGMII_2500 is used > incorrectly in the Marvell mvpp2 network driver and the Marvell PHY > code. This patch removes the references to this macro in the Marvell > PHY driver for now. > > The correct support shall be implemented at a later time. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Konstantin Porotchkin <kostap@marvell.com> > Cc: Stefan Chulski <stefanc@marvell.com> > Cc: Nadav Haklai <nadavh@marvell.com> > Cc: Marek Behun <marek.behun@nic.cz> > --- > This patch is targeted on-top of the latest Marvell SERDES, mvpp2 and > PHY patches to resolve the ongoing discussion of the incorrect usage of > SGMII_2500 for now. > > drivers/net/phy/marvell.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c > index 3bcb0033b391..8850b604ef47 100644 > --- a/drivers/net/phy/marvell.c > +++ b/drivers/net/phy/marvell.c > @@ -634,8 +634,7 @@ static int m88e2110_config(struct phy_device *phydev) > /* Disabled 10G advertisement */ > phy_write(phydev, 7, 0x20, 0x1e1); > } else { > - if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500 || > - phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { > + if (phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { > /* Disabled 10G/5G advertisements */ > phy_write(phydev, 7, 0x20, 0xa1); > } else { > -- > 2.31.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 3bcb0033b391..8850b604ef47 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -634,8 +634,7 @@ static int m88e2110_config(struct phy_device *phydev) /* Disabled 10G advertisement */ phy_write(phydev, 7, 0x20, 0x1e1); } else { - if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500 || - phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { + if (phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { /* Disabled 10G/5G advertisements */ phy_write(phydev, 7, 0x20, 0xa1); } else {
As was discussed on the list, PHY_INTERFACE_MODE_SGMII_2500 is used incorrectly in the Marvell mvpp2 network driver and the Marvell PHY code. This patch removes the references to this macro in the Marvell PHY driver for now. The correct support shall be implemented at a later time. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Konstantin Porotchkin <kostap@marvell.com> Cc: Stefan Chulski <stefanc@marvell.com> Cc: Nadav Haklai <nadavh@marvell.com> Cc: Marek Behun <marek.behun@nic.cz> --- This patch is targeted on-top of the latest Marvell SERDES, mvpp2 and PHY patches to resolve the ongoing discussion of the incorrect usage of SGMII_2500 for now. drivers/net/phy/marvell.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)