summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-05-18 14:46:28 +0200
committerMichal Simek <michal.simek@xilinx.com>2016-05-24 13:17:59 +0200
commit1b008fdb06848c7c84e7c1a4a9b2b76239550555 (patch)
tree1711dda99781ebe6b960886b19fc7dbed8c553de
parent7a673f0b0642fc542b464a91957bdd44179296b2 (diff)
downloadu-boot-imx-1b008fdb06848c7c84e7c1a4a9b2b76239550555.zip
u-boot-imx-1b008fdb06848c7c84e7c1a4a9b2b76239550555.tar.gz
u-boot-imx-1b008fdb06848c7c84e7c1a4a9b2b76239550555.tar.bz2
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>
-rw-r--r--drivers/net/phy/marvell.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 64713fb..d2e68d4 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)