net: ethernet: sun4i-emac: Support phy-handle property for finding PHYs
Subsystems (3)
Chen-Yu Tsai
maintainerPATCH 1/1 net: ethernet: sun4i-emac: Support phy-handle property for finding PHYs
From: Chen-Yu Tsai <[email protected]>
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 8c5b09447625 ("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.
---
The aforementioned commit is in v5.3-rc1. It would be nice to have the driver fix in the same release. In addition, an update for the device tree has been queued up for v5.4, which made us realize the driver needs an update.
--- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/allwinner/sun4i-emac.c +3 -1
@@ -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 ;
Signature · 1 line
2.20.1
From: Chen-Yu Tsai <[email protected]>
Date: Tue, 6 Aug 2019 15:35:39 +0800
Quoted 11 lines
From: Chen-Yu Tsai <[email protected]>
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
8c5b09447625("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 Chen-Yu Tsai <[email protected]>
Applied.