From 08e64cece2f8e793b5c085ebf27c27dfc5ed730d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Fri, 3 Jun 2016 23:16:17 +1000 Subject: net: phy: marvell: Do not reset 88e1310 after autoneg Commit a058052c "net: phy: do not read configuration register on reset", changes the behaviour of the phy_reset function such that the state of the BMCR register is not preserved during reset. Change the config function for the m88e1310 so that it does not do a reset after configuring auto-negotiation. Signed-off-by: Nathan Rossi Cc: Joe Hershberger Cc: Michal Simek Cc: Stefan Roese Acked-by: Michal Simek Acked-by: Joe Hershberger Reviewed-by: Stefan Roese --- drivers/net/phy/marvell.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index d2e68d492a..58d287bb07 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -476,10 +476,7 @@ static int m88e1310_config(struct phy_device *phydev) /* Ensure to return to page 0 */ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000); - genphy_config_aneg(phydev); - phy_reset(phydev); - - return 0; + return genphy_config_aneg(phydev); } static struct phy_driver M88E1011S_driver = { -- cgit v1.2.1