Skip to content
Snippets Groups Projects
Commit 08e64cec authored by Nathan Rossi's avatar Nathan Rossi Committed by Joe Hershberger
Browse files

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: default avatarNathan Rossi <nathan@nathanrossi.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
Reviewed-by: default avatarStefan Roese <sr@denx.de>
parent 79887749
No related branches found
No related tags found
No related merge requests found
...@@ -476,10 +476,7 @@ static int m88e1310_config(struct phy_device *phydev) ...@@ -476,10 +476,7 @@ static int m88e1310_config(struct phy_device *phydev)
/* Ensure to return to page 0 */ /* Ensure to return to page 0 */
phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000); phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000);
genphy_config_aneg(phydev); return genphy_config_aneg(phydev);
phy_reset(phydev);
return 0;
} }
static struct phy_driver M88E1011S_driver = { static struct phy_driver M88E1011S_driver = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment