[PATCH] net: designware: look for a child device node for MDIO bus

[PATCH] net: designware: look for a child device node for MDIO bus

[Ian Abbott]

The Designware driver registers a local MDIO bus for each MAC device,
but without setting a device node pointer for the MDIO bus device.  In
this case, mdiobus_register() will use the MDIO bus's parent device node
(if any) as the MDIO device node.

If the MAC device node has a child node compatible with
"snps,dwmac-mdio", let us use that as the MDIO bus device node.
Otherwise, leave the MDIO bus device node pointer set to NULL and carry
on as before.

The upshot is that PHY device nodes can now be placed in an intermediate
node for the MDIO bus instead of having to place them directly in the
Designware MAC device node.

(Tested on a Terasic DE0-Nano-SoC with a suitably modified device tree.)

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/net/designware.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 49ddaa20d..58880b0e5 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -408,12 +408,22 @@ static void dwc_version(struct device_d *dev, u32 hwid)
 
 static int dwc_probe_dt(struct device_d *dev, struct dw_eth_dev *priv)
 {
+	struct device_node *child;
+
 	if (!IS_ENABLED(CONFIG_OFTREE))
 		return -ENODEV;
 
 	priv->phy_addr = -1;
 	priv->interface = of_get_phy_mode(dev->device_node);
 
+	/* Set MDIO bus device node, if present. */
+	for_each_child_of_node(dev->device_node, child) {
+		if (of_device_is_compatible(child, "snps,dwmac-mdio")) {
+			priv->miibus.dev.device_node = child;
+			break;
+		}
+	}
+
 	return 0;
 }
 
-- 
2.19.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] net: designware: look for a child device node for MDIO bus

[Sascha Hauer]

On Thu, Nov 01, 2018 at 05:01:36PM +0000, Ian Abbott wrote:
> The Designware driver registers a local MDIO bus for each MAC device,
> but without setting a device node pointer for the MDIO bus device.  In
> this case, mdiobus_register() will use the MDIO bus's parent device node
> (if any) as the MDIO device node.
> 
> If the MAC device node has a child node compatible with
> "snps,dwmac-mdio", let us use that as the MDIO bus device node.
> Otherwise, leave the MDIO bus device node pointer set to NULL and carry
> on as before.
> 
> The upshot is that PHY device nodes can now be placed in an intermediate
> node for the MDIO bus instead of having to place them directly in the
> Designware MAC device node.
> 
> (Tested on a Terasic DE0-Nano-SoC with a suitably modified device tree.)
> 
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> ---
>  drivers/net/designware.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/net/designware.c b/drivers/net/designware.c
> index 49ddaa20d..58880b0e5 100644
> --- a/drivers/net/designware.c
> +++ b/drivers/net/designware.c
> @@ -408,12 +408,22 @@ static void dwc_version(struct device_d *dev, u32 hwid)
>  
>  static int dwc_probe_dt(struct device_d *dev, struct dw_eth_dev *priv)
>  {
> +	struct device_node *child;
> +
>  	if (!IS_ENABLED(CONFIG_OFTREE))
>  		return -ENODEV;
>  
>  	priv->phy_addr = -1;
>  	priv->interface = of_get_phy_mode(dev->device_node);
>  
> +	/* Set MDIO bus device node, if present. */
> +	for_each_child_of_node(dev->device_node, child) {
> +		if (of_device_is_compatible(child, "snps,dwmac-mdio")) {
> +			priv->miibus.dev.device_node = child;
> +			break;
> +		}
> +	}
> +
>  	return 0;
>  }
>  
> -- 
> 2.19.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox