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: 803212 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WB23ievo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYj2z5qDtz9sPt for ; Fri, 18 Aug 2017 22:25:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751593AbdHRMYs (ORCPT ); Fri, 18 Aug 2017 08:24:48 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:37625 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbdHRMYI (ORCPT ); Fri, 18 Aug 2017 08:24:08 -0400 Received: by mail-wr0-f196.google.com with SMTP id z91so10260058wrc.4; Fri, 18 Aug 2017 05:24:07 -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=r4sr7JAGuySoxTfR5zi/QzMPAULJH/0rXxKe+ypxntAkHpQrYipp113kzUX0ujv+ZY plk2FeezA2P2fQW5K39l8N3EAXO9mYrT0KrL1qgCeyiTdPsN09LzaCEqM5wq0d/qQpey Y2yQh/7rgpBoPRt3oLD7AQvHVq2Rfkhfpl9xftMCiKWPuAk2FgfZXtuKMvDHRbV1vbq0 mqy1LharL4UV610QO5HxxC1eWwwfsUasNOCQfvYN4GYFFxAhjSGL+N6vD65tyS/j4DrB lfmqajO1XzMnttQZhrShfhio8TCXTnFDANP9C6FB102rbBWUmKPzY4AtaStyUioEBwZP rUwg== X-Gm-Message-State: AHYfb5hzfvwd1cHyokLFnF+jotO1WzgaOuZmRiKvXde8SmmRGH6jN4W1 rPeTTa4kHEclJw== 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 Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Corentin Labbe 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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 { /**