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

Commit 739de9a1 authored by Brad Mouring's avatar Brad Mouring Committed by David S. Miller
Browse files

net: macb: Reorganize macb_mii bringup 



The macb mii setup (mii_probe() and mii_init()) previously was
somewhat interspersed, likely a result of organic growth and hacking.

This change moves mii bus registration into mii_init and probing the
bus for devices into mii_probe.

Signed-off-by: default avatarBrad Mouring <brad.mouring@ni.com>
Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b221d20

drivers/net/ethernet/cadence/macb_main.c

+41 −38
Original line number Diff line number Diff line
@@ -472,8 +472,42 @@ static int macb_mii_probe(struct net_device *dev) 
	struct macb *bp = netdev_priv(dev);

	struct macb_platform_data *pdata;

	struct phy_device *phydev;

	int phy_irq;

	int ret;

	struct device_node *np;

	int phy_irq, ret, i;



	pdata = dev_get_platdata(&bp->pdev->dev);

	np = bp->pdev->dev.of_node;

	ret = 0;



	if (np) {

		if (of_phy_is_fixed_link(np)) {

			if (of_phy_register_fixed_link(np) < 0) {

				dev_err(&bp->pdev->dev,

					"broken fixed-link specification\n");

				return -ENODEV;

			}

			bp->phy_node = of_node_get(np);

		} else {

			/* fallback to standard phy registration if no phy were

			 * found during dt phy registration

			 */

			if (!phy_find_first(bp->mii_bus)) {

				for (i = 0; i < PHY_MAX_ADDR; i++) {

					struct phy_device *phydev;



					phydev = mdiobus_scan(bp->mii_bus, i);

					if (IS_ERR(phydev) &&

					    PTR_ERR(phydev) != -ENODEV) {

						ret = PTR_ERR(phydev);

						break;

					}

				}



				if (ret)

					return -ENODEV;

			}

		}

	}



	if (bp->phy_node) {

		phydev = of_phy_connect(dev, bp->phy_node,
@@ -488,7 +522,6 @@ static int macb_mii_probe(struct net_device *dev) 
			return -ENXIO;

		}



		pdata = dev_get_platdata(&bp->pdev->dev);

		if (pdata) {

			if (gpio_is_valid(pdata->phy_irq_pin)) {

				ret = devm_gpio_request(&bp->pdev->dev,
@@ -533,7 +566,7 @@ static int macb_mii_init(struct macb *bp) 
{

	struct macb_platform_data *pdata;

	struct device_node *np;

	int err = -ENXIO, i;

	int err, i;



	/* Enable management port */

	macb_writel(bp, NCR, MACB_BIT(MPE));
@@ -556,39 +589,9 @@ static int macb_mii_init(struct macb *bp) 
	dev_set_drvdata(&bp->dev->dev, bp->mii_bus);



	np = bp->pdev->dev.of_node;

	if (np) {

		if (of_phy_is_fixed_link(np)) {

			if (of_phy_register_fixed_link(np) < 0) {

				dev_err(&bp->pdev->dev,

					"broken fixed-link specification\n");

				goto err_out_unregister_bus;

			}

			bp->phy_node = of_node_get(np);



			err = mdiobus_register(bp->mii_bus);

		} else {

			/* try dt phy registration */

	if (np) {

		err = of_mdiobus_register(bp->mii_bus, np);



			/* fallback to standard phy registration if no phy were

			 * found during dt phy registration

			 */

			if (!err && !phy_find_first(bp->mii_bus)) {

				for (i = 0; i < PHY_MAX_ADDR; i++) {

					struct phy_device *phydev;



					phydev = mdiobus_scan(bp->mii_bus, i);

					if (IS_ERR(phydev) &&

					    PTR_ERR(phydev) != -ENODEV) {

						err = PTR_ERR(phydev);

						break;

					}

				}



				if (err)

					goto err_out_unregister_bus;

			}

		}

	} else {

		for (i = 0; i < PHY_MAX_ADDR; i++)

			bp->mii_bus->irq[i] = PHY_POLL;
@@ -610,10 +613,10 @@ static int macb_mii_init(struct macb *bp) 


err_out_unregister_bus:

	mdiobus_unregister(bp->mii_bus);

err_out_free_mdiobus:

	of_node_put(bp->phy_node);

	if (np && of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

err_out_free_mdiobus:

	of_node_put(bp->phy_node);

	mdiobus_free(bp->mii_bus);

err_out:

	return err;