Message ID | 9631763433780704781dc06ae4839374a5a5eb73.1463576101.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Commit | 1b008fdb06848c7c84e7c1a4a9b2b76239550555 |
Delegated to: | Michal Simek |
Headers | show |
On Wed, May 18, 2016 at 7:55 AM, Michal Simek <michal.simek@xilinx.com> wrote: > 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> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 64713fbaebf4..d2e68d492a67 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)
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> --- I would expect that more phys are affected by this but I am not able to test them. --- drivers/net/phy/marvell.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)