| Message ID | 1407448106-1819-3-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Date: Thu, 7 Aug 2014 23:48:26 +0200 > This matches what the other drivers using fixed-link support do and > restores the behaviour before commit 87009814cdbb ("ucc_geth: use the > new fixed PHY helpers") for the affected device trees (i.e. no > phy-handle and no fixed-link). > > Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index a22ff770f9e5..07415a0df88c 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -3787,15 +3787,14 @@ static int ucc_geth_probe(struct platform_device* ofdev) ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); ug_info->phy_node = of_parse_phandle(np, "phy-handle", 0); - if (!ug_info->phy_node) { - /* In the case of a fixed PHY, the DT node associated + if (!ug_info->phy_node && of_phy_is_fixed_link(np)) { + /* + * In the case of a fixed PHY, the DT node associated * to the PHY is the Ethernet MAC DT node. */ - if (of_phy_is_fixed_link(np)) { - err = of_phy_register_fixed_link(np); - if (err) - return err; - } + err = of_phy_register_fixed_link(np); + if (err) + return err; ug_info->phy_node = of_node_get(np); }
This matches what the other drivers using fixed-link support do and restores the behaviour before commit 87009814cdbb ("ucc_geth: use the new fixed PHY helpers") for the affected device trees (i.e. no phy-handle and no fixed-link). Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/net/ethernet/freescale/ucc_geth.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)