Commit b2cd2cde authored by Arun Ramadoss's avatar Arun Ramadoss Committed by David S. Miller
Browse files

net: phy: LAN87xx: remove genphy_softreset in config_aneg 



When the T1 phy master/slave state is changed, at the end of config_aneg
function genphy_softreset is called. After the reset all the registers
configured during the config_init are restored to default value.
To avoid this, removed the genphy_softreset call.

v1->v2
------
Added the author in cc

Fixes: 8a1b415d ("net: phy: added ethtool master-slave configuration support")
Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d3a6c37

drivers/net/phy/microchip_t1.c

+1 −6
Original line number Diff line number Diff line
@@ -706,7 +706,6 @@ static int lan87xx_read_status(struct phy_device *phydev) 
static int lan87xx_config_aneg(struct phy_device *phydev)

{

	u16 ctl = 0;

	int rc;



	switch (phydev->master_slave_set) {

	case MASTER_SLAVE_CFG_MASTER_FORCE:
@@ -722,11 +721,7 @@ static int lan87xx_config_aneg(struct phy_device *phydev) 
		return -EOPNOTSUPP;

	}



	rc = phy_modify_changed(phydev, MII_CTRL1000, CTL1000_AS_MASTER, ctl);

	if (rc == 1)

		rc = genphy_soft_reset(phydev);



	return rc;

	return phy_modify_changed(phydev, MII_CTRL1000, CTL1000_AS_MASTER, ctl);

}



static struct phy_driver microchip_t1_phy_driver[] = {