From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ahmad Fatoum Subject: [PATCH 3/4] net: macb: Support specifying PHYs in a mdio container dts node Date: Mon, 20 Aug 2018 14:12:37 +0200 Message-ID: <20180820121238.7779-3-a.fatoum@pengutronix.de> References: <20180820121238.7779-1-a.fatoum@pengutronix.de> Cc: kernel@pengutronix.de, netdev@vger.kernel.org, mdf@kernel.org, Brad Mouring , Florian Fainelli To: Andrew Lunn , "David S. Miller" , Nicolas Ferre Return-path: Received: from metis.ext.pengutronix.de ([85.220.165.71]:47683 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726197AbeHTP2W (ORCPT ); Mon, 20 Aug 2018 11:28:22 -0400 In-Reply-To: <20180820121238.7779-1-a.fatoum@pengutronix.de> Sender: netdev-owner@vger.kernel.org List-ID: To align macb DT entries with those of other MACs. For backwards compatibility, the old way remains supported. Suggested-by: Andrew Lunn Signed-off-by: Ahmad Fatoum --- drivers/net/ethernet/cadence/macb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index ef6ce8691443..2ebc5698db9d 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -596,10 +596,10 @@ static int macb_mii_init(struct macb *bp) err = mdiobus_register(bp->mii_bus); } else { + struct device_node *node = of_get_child_by_name(np, "mdio") ?: np; if (pdata) bp->mii_bus->phy_mask = pdata->phy_mask; - - err = of_mdiobus_register(bp->mii_bus, np); + err = of_mdiobus_register(bp->mii_bus, node); } if (err) -- 2.18.0