Commit bb74d9a4 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

fs_enet: use the new fixed PHY helpers

of_phy_connect_fixed_link() is becoming obsolete, and also required
platform code to register the fixed PHYs at the specified addresses for
those to be usable. Get rid of it and use the new of_phy_is_fixed_link()
plus of_phy_register_fixed_link() helpers to transition over the new
scheme.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 186534a3
...@@ -791,10 +791,6 @@ static int fs_init_phy(struct net_device *dev) ...@@ -791,10 +791,6 @@ static int fs_init_phy(struct net_device *dev)
phydev = of_phy_connect(dev, fep->fpi->phy_node, &fs_adjust_link, 0, phydev = of_phy_connect(dev, fep->fpi->phy_node, &fs_adjust_link, 0,
iface); iface);
if (!phydev) {
phydev = of_phy_connect_fixed_link(dev, &fs_adjust_link,
iface);
}
if (!phydev) { if (!phydev) {
dev_err(&dev->dev, "Could not attach to PHY\n"); dev_err(&dev->dev, "Could not attach to PHY\n");
return -ENODEV; return -ENODEV;
...@@ -1029,10 +1025,17 @@ static int fs_enet_probe(struct platform_device *ofdev) ...@@ -1029,10 +1025,17 @@ static int fs_enet_probe(struct platform_device *ofdev)
fpi->use_napi = 1; fpi->use_napi = 1;
fpi->napi_weight = 17; fpi->napi_weight = 17;
fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0); fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link", if (!fpi->phy_node && of_phy_is_fixed_link(ofdev->dev.of_node)) {
NULL))) err = of_phy_register_fixed_link(ofdev->dev.of_node);
if (err)
goto out_free_fpi; goto out_free_fpi;
/* In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
*/
fpi->phy_node = ofdev->dev.of_node;
}
if (of_device_is_compatible(ofdev->dev.of_node, "fsl,mpc5125-fec")) { if (of_device_is_compatible(ofdev->dev.of_node, "fsl,mpc5125-fec")) {
phy_connection_type = of_get_property(ofdev->dev.of_node, phy_connection_type = of_get_property(ofdev->dev.of_node,
"phy-connection-type", NULL); "phy-connection-type", NULL);
......
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