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

Commit 7239016d authored by Wang Jian's avatar Wang Jian Committed by Jeff Garzik
Browse files

net/phy: Fix 88e1111 copper/fiber selection in RGMII mode 



MII_M1111_HWCFG_FIBER_COPPER_RES is a bit of MII_M1111_PHY_EXT_SR, not
MII_M1111_PHY_EXT_CR.

Signed-off-by: default avatarWang Jian <lark@linux.net.cn>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9cf8fa43

drivers/net/phy/marvell.c

+1 −4
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static int m88e1111_config_init(struct phy_device *phydev) 
{

	int err;

	int temp;

	int mode;



	/* Enable Fiber/Copper auto selection */

	temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
@@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev) 


		temp &= ~(MII_M1111_HWCFG_MODE_MASK);



		mode = phy_read(phydev, MII_M1111_PHY_EXT_CR);



		if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)

		if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES)

			temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;

		else

			temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;