From: Haiying Wang Date: Tue, 2 Jun 2009 04:04:13 +0000 (+0000) Subject: net/phy/marvell: update m88e1111 support for SGMII mode X-Git-Tag: v2.6.31-rc1~330^2~170 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32d0c1e1bee16781e94c7ea8c75499696bce0a33;p=karo-tx-linux.git net/phy/marvell: update m88e1111 support for SGMII mode Disable fiber/copper auto selection for Marvell m88e1111 SGMII support. Signed-off-by: Haiying Wang Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7a3ec9d39a9a..dd6f54d1b495 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)