| Message ID | 1464959777-30464-1-git-send-email-nathan@nathanrossi.com |
|---|---|
| State | Accepted |
| Commit | 08e64cece2f8e793b5c085ebf27c27dfc5ed730d |
| Delegated to: | Joe Hershberger |
| Headers | show |
On 3.6.2016 15:16, Nathan Rossi wrote: > 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 <nathan@nathanrossi.com> > Cc: Joe Hershberger <joe.hershberger@ni.com> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: Stefan Roese <sr@denx.de> > --- > drivers/net/phy/marvell.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c > index d2e68d4..58d287b 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 = { > Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
On Fri, Jun 3, 2016 at 8:16 AM, Nathan Rossi <nathan@nathanrossi.com> wrote: > 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 <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: Joe Hershberger <joe.hershberger@ni.com>
On 03.06.2016 15:16, Nathan Rossi wrote: > 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 <nathan@nathanrossi.com> > Cc: Joe Hershberger <joe.hershberger@ni.com> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan
Hi Nathan, https://patchwork.ozlabs.org/patch/629829/ was applied to u-boot-net.git. Thanks! -Joe
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index d2e68d4..58d287b 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 = {
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 <nathan@nathanrossi.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Stefan Roese <sr@denx.de> --- drivers/net/phy/marvell.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)