From patchwork Tue Jul 21 17:13:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Codrin Ciubotariu X-Patchwork-Id: 11676319 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4A5613B4 for ; Tue, 21 Jul 2020 17:20:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B89192063A for ; Tue, 21 Jul 2020 17:20:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dMYNTMNQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="ZECSguSB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B89192063A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hUByvDvy20bUSLuWfmjcYfGTYmXT/OdWHoI80LaB7BY=; b=dMYNTMNQkGXVKDW6GV/Vk8wLy qMWGbyCqxDqdltL2M9Y7ccVk5j4tRt2RTZysFbENx9VvQLsHxPwhDjVc/NLy7eknfE/pWcOhY82O9 sf0yj31V2hsllCa95ehse+vhQMGxo6SGG8LZPKHsJnV/XMKXLOKX7jkYgIYa6iU0lF1FDGV8+5Szd hDxRK806gR1Ry7lNs9Mbo64RsGaK8Z72j3JOwTv94vQ9YQQM+0zYqzgOylve7m2xJYdo5XEGvv9VQ OdsI+m1BGHVBJmU1vxq52sdUcZw+o+e/ykz26YtxD6xcKitW4KzS5uQ1qGPp1lnIihS8VKa6gLUnC byRvAixaw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxvuz-0001jG-No; Tue, 21 Jul 2020 17:19:05 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxvuw-0001iA-8K for linux-arm-kernel@lists.infradead.org; Tue, 21 Jul 2020 17:19:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1595351942; x=1626887942; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ezYFKCqH/5hy28icqYteFOzwEiGJTFlqWA/30ubs58w=; b=ZECSguSBEW5mEWs81+82NozWmjnIRzcmImAsXrgGiMGsPjvx+KZMFIgP g2pZdVJ7o9Sp4xNTnLRzXSK7Ib6l7o3xnnzTOFgfpQf0Z6tBDFaqxB+Wp ALqtgekgIX1Zr39Mh53L2gbfL6ZlGvIjjDNHn4hG7rOlC7vRoZR5mhUCs 8A+Da2D0o/1DWRCnN/h/bpwUdp12x17J2Ek3ALmExOKqLz3m2HvqmCPTK FER4dAXVl9Ba6eBlThWjWhfkX3+3sOYp+bkrHCghABIPegDmC1VqcmULO eK7qkcjC36eBcF0jSBEif6spNZgFHdRksP0Tm8WlxHkpF0C4VK351azgq A==; IronPort-SDR: JSYWO+OjTE4pFjk0/3Pe4owm1/AghDIxxkkQmcAKbcTKh0Ls39YkO08aG1JAwt1CE0rLcrpVWz XfOi3+3Hi8S7fi2VqbcbZDl6UYPP6wvWlwdRITeTFSoafBcHvyoyHKGgii/PWZgxsT1Oa9brEu 8/rgCbBoZ/+YaCKcPmH4J8giOhv1xuZJRGMZlUUyopFn7wHiTWcYNnNV6TvsLYbXIeG9uzUf+B zQaAOZKih9MSfhkAP8ZNCaCbW1ZsiNXcjsC606LXlGHLoE502JDYrAcSM4rRzfw7wZbmsKJrk0 EMM= X-IronPort-AV: E=Sophos;i="5.75,379,1589266800"; d="scan'208";a="82697502" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 21 Jul 2020 10:19:00 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 21 Jul 2020 10:18:23 -0700 Received: from rob-ult-m19940.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 21 Jul 2020 10:17:34 -0700 From: Codrin Ciubotariu To: , , , Subject: [PATCH net-next v2 3/7] net: macb: parse PHY nodes found under an MDIO node Date: Tue, 21 Jul 2020 20:13:12 +0300 Message-ID: <20200721171316.1427582-4-codrin.ciubotariu@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200721171316.1427582-1-codrin.ciubotariu@microchip.com> References: <20200721171316.1427582-1-codrin.ciubotariu@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200721_131902_471486_5F607B8E X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.149.84 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [68.232.149.84 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@lunn.ch, alexandre.belloni@bootlin.com, f.fainelli@gmail.com, claudiu.beznea@microchip.com, ludovic.desroches@microchip.com, robh+dt@kernel.org, kuba@kernel.org, Codrin Ciubotariu , davem@davemloft.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The MACB embeds an MDIO bus controller. For this reason, the PHY nodes were represented as sub-nodes in the MACB node. Generally, the Ethernet controller is different than the MDIO controller, so the PHYs are probed by a separate MDIO driver. Since adding the PHY nodes directly under the ETH node became deprecated, we adjust the MACB driver to look for an MDIO node and register the subnode MDIO devices. Signed-off-by: Codrin Ciubotariu --- Changes in v2: - readded newline removed by mistake; drivers/net/ethernet/cadence/macb_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 89fe7af5e408..b25c64b45148 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -740,10 +740,20 @@ static int macb_mii_probe(struct net_device *dev) static int macb_mdiobus_register(struct macb *bp) { struct device_node *child, *np = bp->pdev->dev.of_node; + struct device_node *mdio_node; + int ret; if (of_phy_is_fixed_link(np)) return mdiobus_register(bp->mii_bus); + /* if an MDIO node is present, it should contain the PHY nodes */ + mdio_node = of_get_child_by_name(np, "mdio"); + if (mdio_node) { + ret = of_mdiobus_register(bp->mii_bus, mdio_node); + of_node_put(mdio_node); + return ret; + } + /* Only create the PHY from the device tree if at least one PHY is * described. Otherwise scan the entire MDIO bus. We do this to support * old device tree that did not follow the best practices and did not