From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 18 May 2016 12:46:28 +0000 (+0200)
Subject: phy: marvell: Do not reset phy after negotiation
X-Git-Tag: KARO-TXSD-2017-03-15~1014^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b008fdb06848c7c84e7c1a4a9b2b76239550555;p=karo-tx-uboot.git

phy: marvell: Do not reset phy after negotiation

The patch
"net: phy: do not read configuration register on reset"
(sha1: a058052c358c3ecf5f394ff37def6a45eb26768c)
was causing regression on zynq zc702 board where Marwell 88e1118
phy was resetted after negotiation was setup.
Phy reset is done pretty early in phy_connect_dev() and doens't need to
be called again in phy code.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 64713fbaeb..d2e68d492a 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -352,11 +352,7 @@ static int m88e1118_config(struct phy_device *phydev)
 	/* Change Page Number */
 	phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000);
 
-	genphy_config_aneg(phydev);
-
-	phy_reset(phydev);
-
-	return 0;
+	return genphy_config_aneg(phydev);
 }
 
 static int m88e1118_startup(struct phy_device *phydev)