Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be403645 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

gianfar: 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 bb74d9a4

drivers/net/ethernet/freescale/gianfar.c

+11 −3
Original line number Diff line number Diff line
@@ -889,6 +889,17 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) 


	priv->phy_node = of_parse_phandle(np, "phy-handle", 0);



	/* In the case of a fixed PHY, the DT node associated

	 * to the PHY is the Ethernet MAC DT node.

	 */

	if (of_phy_is_fixed_link(np)) {

		err = of_phy_register_fixed_link(np);

		if (err)

			goto err_grp_init;



		priv->phy_node = np;

	}



	/* Find the TBI PHY.  If it's not there, we don't support SGMII */

	priv->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
@@ -1660,9 +1671,6 @@ static int init_phy(struct net_device *dev) 


	priv->phydev = of_phy_connect(dev, priv->phy_node, &adjust_link, 0,

				      interface);

	if (!priv->phydev)

		priv->phydev = of_phy_connect_fixed_link(dev, &adjust_link,

							 interface);

	if (!priv->phydev) {

		dev_err(&dev->dev, "could not attach to PHY\n");

		return -ENODEV;