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

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
...@@ -158,7 +158,6 @@ static int m88e1111_config_init(struct phy_device *phydev) ...@@ -158,7 +158,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
{ {
int err; int err;
int temp; int temp;
int mode;
/* Enable Fiber/Copper auto selection */ /* Enable Fiber/Copper auto selection */
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
...@@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev) ...@@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
temp &= ~(MII_M1111_HWCFG_MODE_MASK); temp &= ~(MII_M1111_HWCFG_MODE_MASK);
mode = phy_read(phydev, MII_M1111_PHY_EXT_CR); if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES)
if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)
temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII; temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
else else
temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII; temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment