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

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

ucc_geth: 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 be403645

drivers/net/ethernet/freescale/ucc_geth.c

+11 −3
Original line number Diff line number Diff line
@@ -1728,9 +1728,6 @@ static int init_phy(struct net_device *dev) 


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

				priv->phy_interface);

	if (!phydev)

		phydev = of_phy_connect_fixed_link(dev, &adjust_link,

						   priv->phy_interface);

	if (!phydev) {

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

		return -ENODEV;
@@ -3790,6 +3787,17 @@ static int ucc_geth_probe(struct platform_device* ofdev) 
	ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);



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

	if (!ug_info->phy_node) {

		/* 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)

				return err;

		}

		ug_info->phy_node = np;

	}



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

	ug_info->tbi_node = of_parse_phandle(np, "tbi-handle", 0);