Skip to content

Commit 7239016

Browse files
Wang JianJeff Garzik
authored andcommitted
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: Wang Jian <lark@linux.net.cn> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
1 parent 9cf8fa4 commit 7239016

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/net/phy/marvell.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
158158
{
159159
int err;
160160
int temp;
161-
int mode;
162161

163162
/* Enable Fiber/Copper auto selection */
164163
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
@@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
198197

199198
temp &= ~(MII_M1111_HWCFG_MODE_MASK);
200199

201-
mode = phy_read(phydev, MII_M1111_PHY_EXT_CR);
202-
203-
if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)
200+
if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES)
204201
temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
205202
else
206203
temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;

0 commit comments

Comments
 (0)