Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be8c6480 authored by Arnaud Patard's avatar Arnaud Patard Committed by David S. Miller
Browse files

phy/marvell: fix 88e1121 support 



Commit c477d044 added support for RGMII
rx/tx delays except that it ends up clearing rx/tx delays bit for modes
differents that RGMII*ID. Due to this, ethernet is not working anymore
on my guruplug server +. This patch is fixing that.

Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27ab7606

drivers/net/phy/marvell.c

+19 −12
Original line number Diff line number Diff line
@@ -196,6 +196,12 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
			MII_88E1121_PHY_MSCR_PAGE);

	if (err < 0)

		return err;



	if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {



		mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &

			MII_88E1121_PHY_MSCR_DELAY_MASK;
@@ -210,6 +216,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
		err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);

		if (err < 0)

			return err;

	}



	phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);