diff options
| author | Haiying Wang <Haiying.Wang@freescale.com> | 2009-06-02 04:04:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 02:52:45 -0700 |
| commit | 32d0c1e1bee16781e94c7ea8c75499696bce0a33 (patch) | |
| tree | 0afbcbfff39ddb57777a475c116bff84142c72d5 /drivers/net/phy/marvell.c | |
| parent | e5b9215ef9a274eb9fb65f6aa4602ad82d10a6cb (diff) | |
| download | linux-32d0c1e1bee16781e94c7ea8c75499696bce0a33.tar.bz2 | |
net/phy/marvell: update m88e1111 support for SGMII mode
Disable fiber/copper auto selection for Marvell m88e1111 SGMII support.
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) |