superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: ftgmac100: refactor getting phy device handle 

Consolidate the handling of dedicated PHY and fixed-link phy by taking
advantage of logic in of_phy_get_and_connect() which handles both of
these cases, rather than open coding the same logic in ftgmac100_probe().

Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20241022084214.1261174-1-jacky_chou@aspeedtech.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
pull/1083/head
Jacky Chou 2024-10-22 16:42:14 +08:00 committed by Jakub Kicinski
parent b62607870b
commit 4dbc8d6d05
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/faraday/ftgmac100.c
View File

@ -1918,35 +1918,17 @@ static int ftgmac100_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Connecting PHY failed\n");
goto err_phy_connect;
}
} else if (np && of_phy_is_fixed_link(np)) {
struct phy_device *phy;
err = of_phy_register_fixed_link(np);
if (err) {
dev_err(&pdev->dev, "Failed to register fixed PHY\n");
goto err_phy_connect;
}
phy = of_phy_get_and_connect(priv->netdev, np,
&ftgmac100_adjust_link);
if (!phy) {
dev_err(&pdev->dev, "Failed to connect to fixed PHY\n");
of_phy_deregister_fixed_link(np);
err = -EINVAL;
goto err_phy_connect;
}
/* Display what we found */
phy_attached_info(phy);
} else if (np && of_get_property(np, "phy-handle", NULL)) {
} else if (np && (of_phy_is_fixed_link(np) ||
of_get_property(np, "phy-handle", NULL))) {
struct phy_device *phy;
/* Support "mdio"/"phy" child nodes for ast2400/2500 with
* an embedded MDIO controller. Automatically scan the DTS for
* available PHYs and register them.
*/
if (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
of_device_is_compatible(np, "aspeed,ast2500-mac")) {
if (of_get_property(np, "phy-handle", NULL) &&
(of_device_is_compatible(np, "aspeed,ast2400-mac") ||
of_device_is_compatible(np, "aspeed,ast2500-mac"))) {
err = ftgmac100_setup_mdio(netdev);
if (err)
goto err_setup_mdio;