| Message ID | 20200331093935.23542-1-codrin.ciubotariu@microchip.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: macb: Fix handling of fixed-link node | expand |
From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Date: Tue, 31 Mar 2020 12:39:35 +0300 > fixed-link nodes are treated as PHY nodes by of_mdiobus_child_is_phy(). > We must check if the interface is a fixed-link before looking up for PHY > nodes. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Tested-by: Cristian Birsan <cristian.birsan@microchip.com> > Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 2c28da1737fe..b3a51935e8e0 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -724,6 +724,9 @@ static int macb_mdiobus_register(struct macb *bp) { struct device_node *child, *np = bp->pdev->dev.of_node; + if (of_phy_is_fixed_link(np)) + return mdiobus_register(bp->mii_bus); + /* Only create the PHY from the device tree if at least one PHY is * described. Otherwise scan the entire MDIO bus. We do this to support * old device tree that did not follow the best practices and did not
fixed-link nodes are treated as PHY nodes by of_mdiobus_child_is_phy(). We must check if the interface is a fixed-link before looking up for PHY nodes. Fixes: 7897b071ac3b ("net: macb: convert to phylink") Tested-by: Cristian Birsan <cristian.birsan@microchip.com> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> --- drivers/net/ethernet/cadence/macb_main.c | 3 +++ 1 file changed, 3 insertions(+)