path: root/drivers/net
diff options
authorNathan Rossi <>2016-06-03 23:16:17 +1000
committerJoe Hershberger <>2016-06-21 17:01:52 -0500
commit08e64cece2f8e793b5c085ebf27c27dfc5ed730d (patch)
tree52330705c155db8552225d47554c8383fefef5b3 /drivers/net
parent79887749f802af5c30ef019bd13f299f79a1530a (diff)
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 <> Cc: Joe Hershberger <> Cc: Michal Simek <> Cc: Stefan Roese <> Acked-by: Michal Simek <> Acked-by: Joe Hershberger <> Reviewed-by: Stefan Roese <>
Diffstat (limited to 'drivers/net')
1 files changed, 1 insertions, 4 deletions
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 = {
OpenPOWER on IntegriCloud