From patchwork Fri Aug 18 12:21:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9908555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8EDF0602C8 for ; Fri, 18 Aug 2017 12:34:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A05A28BB0 for ; Fri, 18 Aug 2017 12:34:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E9EC28BBA; Fri, 18 Aug 2017 12:34:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ECA2428BB5 for ; Fri, 18 Aug 2017 12:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=KFtJuHyAVEs35896kxXc/F1BTQPA1QBMK7jNXPeY8oA=; b=cZhUd7pAdKShZuZahJAAZabhgE f5qTaYT6WX6+90cgGJvKOE1qJYH25+Fso1L2no8j7ZLjYT6PcRIdX0a5+f9WdtYDfs1imgBk9gE3a FLSEuDLIyVv6xBzIgRk/RD11Au9lXOv2o/bTHiPI3EiVG1W1I966F2RZ0R6t4vTM8fkP5yMUhylST xcsxgbtfuD/8W9DFlgMqhGcYKCR6n0fuxSLw1EFZv/M3Bqd6NnTyHMe1cGTCX5zjnyKI1JiTPaPCH oGrimwgo79H4PiWcKxWle4rR2lZO7xoiUK7Wz2egfIvvrBZQvYmW2YLYc36EBWqOqpfEAAcaiLp0h FaexuI8w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1digTv-0007jX-35; Fri, 18 Aug 2017 12:34:31 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1digKB-0007Nh-H7 for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2017 12:24:29 +0000 Received: by mail-wr0-x243.google.com with SMTP id 49so7222908wrw.5 for ; Fri, 18 Aug 2017 05:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MXz0eo2v3wBfNhD2h7iinMkwkCGW4u1dxs3SHMFmj6E=; b=WB23ievoCsxAxfjlYWW/P4jfvqQtONp64pQH1pbpwd5v957Ry9ms2djie71ph7TihH RaF/gFvrD0z2cVNcMV5tKo6A/GPTbE+l8Skzc/eJCChSjr2FfdJfi5jvXqmt5uycNZtD orsJaCBzZXpp1YXAyLRlP8qu1Uasub3lrj1S3G1cMWyYstrFvYRMvOQXxAe1v6ot1/QV M4j5SoLIWDAjbYFiMeHCVPYyOwTKjpdZfw43lNtTMtwMOetbK+Jz+ud1V3ujOqklsMk4 kKyHsAsnIuFGYfwqpNGttBSTG3TL4g9XV5l8FZFFt7N6sHiVk+z7stll80M4jfG7aFVu 4XdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MXz0eo2v3wBfNhD2h7iinMkwkCGW4u1dxs3SHMFmj6E=; b=PG2M46Tn6uLvLU8b4wdN1Sk2DKhuxJg/EulPv9hFjZwjdAMJn1dgwQK4xXuZcOj3mA OYK+yYWvJhqfqzevJyN6YCxPKIT9a2Hdmdp8hwA7pN1qTNtrcGCpB4ezQ3/DPtUaWCTM k9TRhQceXfUWAfdPl7A51Vp42cFCpSBkjX41PnBduYwXnQYf4mGnLiSj8VX9KO0sOz1Y JsoHfhmCTk9x61KyrKWzYx0HT5OwMAr94qv5XYROuEn91ve3o+8KaDCsNTnxL+o0zJuy NxmHPaKtS6/b/UCwCrtVT38HZyg4it8UTdOoecyb1ceyQ6Wd+mVCikWBCnYND/gY18Jj gHwg== X-Gm-Message-State: AHYfb5juar+e9YiBP8oq172iYsqMkPghjqexr+w4ONL4DL9/XlhARMP+ 8VC96dRTkFaufg== X-Received: by 10.28.214.13 with SMTP id n13mr1249460wmg.16.1503059047189; Fri, 18 Aug 2017 05:24:07 -0700 (PDT) Received: from Red.local (LFbn-1-7109-228.w90-116.abo.wanadoo.fr. [90.116.45.228]) by smtp.googlemail.com with ESMTPSA id b23sm7754738wrd.40.2017.08.18.05.24.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Aug 2017 05:24:06 -0700 (PDT) From: Corentin Labbe To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, wens@csie.org, peppe.cavallaro@st.com, alexandre.torgue@st.com Subject: [PATCH v3 3/4] net: stmmac: register parent MDIO node for sun8i-h3-emac Date: Fri, 18 Aug 2017 14:21:17 +0200 Message-Id: <20170818122118.4925-4-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170818122118.4925-1-clabbe.montjoie@gmail.com> References: <20170818122118.4925-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170818_052427_766184_F5D045F9 X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Corentin Labbe , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In case of a MDIO switch, the registered MDIO node should be the parent of the PHY. Otherwise of_phy_connect will fail. Signed-off-by: Corentin Labbe --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index a366b3747eeb..ca3cc99d8960 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -312,10 +312,12 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, static const struct of_device_id need_mdio_ids[] = { { .compatible = "snps,dwc-qos-ethernet-4.10" }, { .compatible = "allwinner,sun8i-a83t-emac" }, - { .compatible = "allwinner,sun8i-h3-emac" }, { .compatible = "allwinner,sun8i-v3s-emac" }, { .compatible = "allwinner,sun50i-a64-emac" }, }; + static const struct of_device_id need_mdio_mux_ids[] = { + { .compatible = "allwinner,sun8i-h3-emac" }, + }; /* If phy-handle property is passed from DT, use it as the PHY */ plat->phy_node = of_parse_phandle(np, "phy-handle", 0); @@ -332,7 +334,13 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, mdio = false; } - if (of_match_node(need_mdio_ids, np)) { + /* + * In case of a MDIO switch/mux, the registered MDIO node should be + * the parent of the PHY. Otherwise of_phy_connect will fail. + */ + if (of_match_node(need_mdio_mux_ids, np)) { + plat->mdio_node = of_get_parent(plat->phy_node); + } else if (of_match_node(need_mdio_ids, np)) { plat->mdio_node = of_get_child_by_name(np, "mdio"); } else { /**