Message ID | 1243951456-4685-1-git-send-email-Haiying.Wang@freescale.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Kumar Gala |
Headers | show |
From: Haiying Wang <Haiying.Wang@freescale.com> Date: Tue, 2 Jun 2009 10:04:13 -0400 > Disable fiber/copper auto selection for Marvell m88e1111 SGMII support. > > Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Applied to net-next-2.6
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7a3ec9d..dd6f54d 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -243,6 +243,7 @@ static int m88e1111_config_init(struct phy_device *phydev) temp &= ~(MII_M1111_HWCFG_MODE_MASK); temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK; + temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO; err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); if (err < 0)
Disable fiber/copper auto selection for Marvell m88e1111 SGMII support. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> --- drivers/net/phy/marvell.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)