From: Codrin Ciubotariu codrin.ciubotariu@microchip.com
[ Upstream commit 79540d133ed6f65a37dacb54b7a704cc8a24c52d ]
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 Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/net/ethernet/cadence/macb_main.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -685,6 +685,9 @@ static int macb_mdiobus_register(struct { 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