diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-05-18 14:46:28 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-05-24 13:17:59 +0200 |
| commit | 1b008fdb06848c7c84e7c1a4a9b2b76239550555 (patch) | |
| tree | 1711dda99781ebe6b960886b19fc7dbed8c553de /drivers/net | |
| parent | 7a673f0b0642fc542b464a91957bdd44179296b2 (diff) | |
| download | talos-obmc-uboot-1b008fdb06848c7c84e7c1a4a9b2b76239550555.tar.gz talos-obmc-uboot-1b008fdb06848c7c84e7c1a4a9b2b76239550555.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/marvell.c | 6 |
1 files changed, 1 insertions, 5 deletions
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) |
