net: macb: Fix handling of fixed-link node

Codrin Ciubotariu · Codrin Ciubotariu · commit 9e9ea84f9ce7 · 2020-04-01T11:05:09.000+03:00
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: 7897b07 ("net: macb: convert to phylink") Tested-by: Cristian Birsan <cristian.birsan@microchip.com> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
@@ -672,6 +672,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

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,9 @@ static int macb_mdiobus_register(struct macb *bp)`
`672`	`672`	`{`
`673`	`673`	`struct device_node child, np = bp->pdev->dev.of_node;`
`674`	`674`
	`675`	`+ if (of_phy_is_fixed_link(np))`
	`676`	`+ return mdiobus_register(bp->mii_bus);`
	`677`	`+`
`675`	`678`	`/* Only create the PHY from the device tree if at least one PHY is`
`676`	`679`	`* described. Otherwise scan the entire MDIO bus. We do this to support`
`677`	`680`	`* old device tree that did not follow the best practices and did not`