Skip to content

Commit

Permalink
net/phy: Fix 88e1111 copper/fiber selection in RGMII mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wang Jian authored and Jeff Garzik committed Jul 22, 2008
1 parent 9cf8fa4 commit 7239016
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/net/phy/marvell.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7239016

Please sign in to comment.