From 270a0666fd284f00ac3b37ad6fdac3d01e861f50 Mon Sep 17 00:00:00 2001 From: Haiying Wang Date: Tue, 2 Jun 2009 04:04:13 +0000 Subject: [PATCH] --- yaml --- r: 150613 b: refs/heads/master c: 32d0c1e1bee16781e94c7ea8c75499696bce0a33 h: refs/heads/master i: 150611: 10bef78367d6bb0c6c91d18d11ec96c9328febe8 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/marvell.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fbd4bd2ddb9e..30c5fcea5578 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5b9215ef9a274eb9fb65f6aa4602ad82d10a6cb +refs/heads/master: 32d0c1e1bee16781e94c7ea8c75499696bce0a33 diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c index 7a3ec9d39a9a..dd6f54d1b495 100644 --- a/trunk/drivers/net/phy/marvell.c +++ b/trunk/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)