| Message ID | 20230530225131.949721-4-marek.vasut+renesas@mailbox.org |
|---|---|
| State | Accepted |
| Commit | 8869a8883be80e1430da09095147b795848e6ba9 |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | [01/14] net: eth-phy: staticize eth_phy_reset() | expand |
On Wed, May 31, 2023 at 1:51 AM Marek Vasut <marek.vasut+renesas@mailbox.org> wrote: > > Use new U-Boot phy_connect() API which also supports fixed PHYs. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> > --- > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Joe Hershberger <joe.hershberger@ni.com> > Cc: Michal Simek <michal.simek@amd.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Ramon Fried <rfried.dev@gmail.com> > --- > drivers/net/ethoc.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c > index 29067e9e949..13fad8119bb 100644 > --- a/drivers/net/ethoc.c > +++ b/drivers/net/ethoc.c > @@ -608,18 +608,16 @@ static int ethoc_mdio_init(const char *name, struct ethoc *priv) > static int ethoc_phy_init(struct ethoc *priv, void *dev) > { > struct phy_device *phydev; > - int mask = 0xffffffff; > + int mask = -1; > > #ifdef CONFIG_PHY_ADDR > - mask = 1 << CONFIG_PHY_ADDR; > + mask = CONFIG_PHY_ADDR; > #endif > > - phydev = phy_find_by_mask(priv->bus, mask); > + phydev = phy_connect(priv->bus, mask, dev, PHY_INTERFACE_MODE_MII); > if (!phydev) > return -ENODEV; > > - phy_connect_dev(phydev, dev, PHY_INTERFACE_MODE_MII); > - > phydev->supported &= PHY_BASIC_FEATURES; > phydev->advertising = phydev->supported; > > -- > 2.39.2 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 29067e9e949..13fad8119bb 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -608,18 +608,16 @@ static int ethoc_mdio_init(const char *name, struct ethoc *priv) static int ethoc_phy_init(struct ethoc *priv, void *dev) { struct phy_device *phydev; - int mask = 0xffffffff; + int mask = -1; #ifdef CONFIG_PHY_ADDR - mask = 1 << CONFIG_PHY_ADDR; + mask = CONFIG_PHY_ADDR; #endif - phydev = phy_find_by_mask(priv->bus, mask); + phydev = phy_connect(priv->bus, mask, dev, PHY_INTERFACE_MODE_MII); if (!phydev) return -ENODEV; - phy_connect_dev(phydev, dev, PHY_INTERFACE_MODE_MII); - phydev->supported &= PHY_BASIC_FEATURES; phydev->advertising = phydev->supported;
Use new U-Boot phy_connect() API which also supports fixed PHYs. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> --- Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Michal Simek <michal.simek@amd.com> Cc: Nishanth Menon <nm@ti.com> Cc: Ramon Fried <rfried.dev@gmail.com> --- drivers/net/ethoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)