diff options
author | Moritz Fischer <mdf@kernel.org> | 2019-09-04 04:35:07 +0200 |
---|---|---|
committer | Moritz Fischer <mdf@kernel.org> | 2019-09-04 04:35:07 +0200 |
commit | af9ca4b0bd0502bb134f18d394a613be371d2352 (patch) | |
tree | 37b1159d4456e223981dddde4795f2061c83d14c /drivers/net/ethernet/allwinner/sun4i-emac.c | |
parent | Merge tag 'dev_groups_all_drivers' into fpga-dfl-for-5.4 (diff) | |
parent | Merge 5.3-rc7 into char-misc-next (diff) | |
download | linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.xz linux-af9ca4b0bd0502bb134f18d394a613be371d2352.zip |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into fpga-dfl-for-5.4
Diffstat (limited to 'drivers/net/ethernet/allwinner/sun4i-emac.c')
-rw-r--r-- | drivers/net/ethernet/allwinner/sun4i-emac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 3434730a7699..0537df06a9b5 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -860,7 +860,9 @@ static int emac_probe(struct platform_device *pdev) 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) { dev_err(&pdev->dev, "no associated PHY\n"); ret = -ENODEV; |