projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5b9215)
net/phy/marvell: update m88e1111 support for SGMII mode
authorHaiying Wang <Haiying.Wang@freescale.com>
Tue, 2 Jun 2009 04:04:13 +0000 (04:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Jun 2009 09:52:45 +0000 (02:52 -0700)
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>
drivers/net/phy/marvell.c patch | blob | blame | history

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 7a3ec9d39a9a62952a5f598c9dd03794a3a58529..dd6f54d1b49539a39fb2b18bfd19d2a5e10f3746 100644 (file)
--- 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)