From: Nathan Rossi <nathan@nathanrossi.com>
Date: Fri, 3 Jun 2016 13:16:17 +0000 (+1000)
Subject: net: phy: marvell: Do not reset 88e1310 after autoneg
X-Git-Tag: v2016.07-rc3~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=08e64cece2f8e793b5c085ebf27c27dfc5ed730d;p=oweals%2Fu-boot.git

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 <nathan@nathanrossi.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---

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 = {