From patchwork Mon Aug 20 12:12:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Fatoum X-Patchwork-Id: 959650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41vCPT7557z9s4s for ; Mon, 20 Aug 2018 22:13:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbeHTP2W (ORCPT ); Mon, 20 Aug 2018 11:28:22 -0400 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 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1frj3I-0004nm-EE; Mon, 20 Aug 2018 14:12:56 +0200 Received: from afa by dude.hi.pengutronix.de with local (Exim 4.91) (envelope-from ) id 1frj3H-0008UI-MD; Mon, 20 Aug 2018 14:12:55 +0200 From: Ahmad Fatoum To: Andrew Lunn , "David S. Miller" , Nicolas Ferre Cc: kernel@pengutronix.de, netdev@vger.kernel.org, mdf@kernel.org, Brad Mouring , Florian Fainelli 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> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180820121238.7779-1-a.fatoum@pengutronix.de> References: <20180820121238.7779-1-a.fatoum@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: afa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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)