Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3745ead authored by Stef van Os's avatar Stef van Os Committed by David S. Miller
Browse files

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: default avatarStef van Os <stef.van.os@prodrive.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13b6d2e6

drivers/net/phy/marvell.c

+0 −9
Original line number Diff line number Diff line
@@ -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) ||