diff options
| author | Stef van Os <stef.van.os@prodrive.nl> | 2013-01-17 16:36:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-17 21:47:24 +0100 |
| commit | c3745ead19ad148c57f606a0dbaee1d21214f3f7 (patch) | |
| tree | 9e46991d0fec6d75694370fac07718458c9fc879 /drivers | |
| parent | 3c574_cs: fix operator precedence between << and & (diff) | |
| download | linux-c3745ead19ad148c57f606a0dbaee1d21214f3f7.tar.xz linux-c3745ead19ad148c57f606a0dbaee1d21214f3f7.zip | |
phy/marvell: remove fiber/copper autoselect on 88e1111
Remove the code that always enables copper/fiber autoselect,
ignoring the DIS_FC strapping pin. The default value for this
register is autoselect on anyway, and if you explicitly disable
autoselect via strapping you probably really don't want
autoselect.
Signed-off-by: Stef van Os <stef.van.os@prodrive.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/marvell.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 5d2a3f215887..22dec9c7ef05 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -353,15 +353,6 @@ static int m88e1111_config_init(struct phy_device *phydev) int err; int temp; - /* Enable Fiber/Copper auto selection */ - temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); - temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO; - phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); - - temp = phy_read(phydev, MII_BMCR); - temp |= BMCR_RESET; - phy_write(phydev, MII_BMCR, temp); - if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || |