Commit 5c4e2e1a authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by David S. Miller

net: ethernet: sun4i-emac: Support phy-handle property for finding PHYs

The sun4i-emac uses the "phy" property to find the PHY it's supposed to
use. This property was deprecated in favor of "phy-handle" in commit
8c5b0944 ("dt-bindings: net: sun4i-emac: Convert the binding to a
schemas").

Add support for this new property name, and fall back to the old one in
case the device tree hasn't been updated.
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7813d5c
...@@ -860,7 +860,9 @@ static int emac_probe(struct platform_device *pdev) ...@@ -860,7 +860,9 @@ static int emac_probe(struct platform_device *pdev)
goto out_clk_disable_unprepare; goto out_clk_disable_unprepare;
} }
db->phy_node = of_parse_phandle(np, "phy", 0); db->phy_node = of_parse_phandle(np, "phy-handle", 0);
if (!db->phy_node)
db->phy_node = of_parse_phandle(np, "phy", 0);
if (!db->phy_node) { if (!db->phy_node) {
dev_err(&pdev->dev, "no associated PHY\n"); dev_err(&pdev->dev, "no associated PHY\n");
ret = -ENODEV; ret = -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment