From patchwork Wed Jul 12 07:32:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9836039 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 4CE3560363 for ; Wed, 12 Jul 2017 07:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38434285B5 for ; Wed, 12 Jul 2017 07:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B48E285CB; Wed, 12 Jul 2017 07:35:22 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM 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 A087F285B5 for ; Wed, 12 Jul 2017 07:35:21 +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: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:In-Reply-To: References:List-Owner; bh=SQL8Zt867AeeS2zjCwank9FwT86+Nq3e/HBsHSgVc3Q=; b=nVO y56WxeL05YEeH1g4c4goRvToHhdXbBx45u/htSFHZe8oc27G5H+EAZLgiW94C1C97tvD+tiRI5Ryl NVTau6HrHpc6FPfbbcXNH8qv5gRUjxqHok0jbSvIuFM17U/XlnHo7efvuZ4WjWYg/AjjkrU4EHvzb 3to/U7R8bbr+igpVn82HyW/NNk+sRFJJw3kbyds42nilcqG2FwUQvB7nBaVVC7gzDiMSxCX38TJqo nTyrx0cBJmUFc4Tn2Ofb3cxLV4D/KI93F5SVHoCbxh+NItnh+ppss81f8CoUhVHaAG3Ak9qc85Xuo 5lkx/y/s2cmN/zsVf6pfQnEMX9UQB6Q==; 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 1dVCB4-0006Ah-AL; Wed, 12 Jul 2017 07:35:18 +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 1dVCB0-0004s6-IL for linux-arm-kernel@lists.infradead.org; Wed, 12 Jul 2017 07:35:16 +0000 Received: by mail-wr0-x243.google.com with SMTP id x23so3770442wrb.0 for ; Wed, 12 Jul 2017 00:34:53 -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; bh=P6r92cJNprbwThDQHui9T381m5Kr88vPsjjuJBcEFc4=; b=sOZv8WKL5Uehzs7rWSABM8H7w4vrZhzjUSuyZL34vAPtG7iGspLLupQoQCVYVBDP8y zgRAR1Ir1y6Yj3gfERwT26cTa/DWM5yLoX3qayjHbyS1zTl1LWbRxFtX1aOBBgd5jE1F /buJAi5lqXqb5dF9yrMdX0dFe0zART6PsYK7tq/gOnlR/M1EhIaz+FIWV/9CC+oKlwFB vZxSNee6rxCTuyqVD2UgcGTHXCWotJ9VLe1u1yeaz4i7kFGRC45LTPqMbjGGzHw8nMG5 PVA9xKpiI6enoLyBjgaHVUcyKVfa/wJA0xGGGMSr6Z6sq1lWn4n/f6yD0T/UKyt6uRdG RNOw== 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; bh=P6r92cJNprbwThDQHui9T381m5Kr88vPsjjuJBcEFc4=; b=rDum88Xu3kIC1aHbWLV8ro4+U8zBqar/JTf2PToWNT0VrRhLYu+n1NSsRDBk2a1zqD 0yTA/biI0mnbBacYv0nw1h7dNgkJO5tLlG298JUvNo2gZRQliss8/MyP+zpjNfHghuqj Xl8LXTe9YlP9oNrbVcSB4sautnbTF+BDxK1g+Nx2hchV7DBL272WFDM4KyvP5r0jvz3F g2KA6GPlEdZ+dSm3f2gtx0NZ5E3YQYbFpwCHGEKoNgAvtg8jOt9TXSAm8opdnrcpmSx0 j6WpiJzs9AF7wTvdILNfGHAJU+e7XFfSC7qzORMwptcC5A5Wr7/U/QRgXS5SqtPyxiK/ 2+LQ== X-Gm-Message-State: AIVw111HB2n5/0n0uYcoQp/ZKDHq0cpy6AsXGQIQ/oB1THWWiRXulk+3 23f7a0Nclouu1AqP X-Received: by 10.223.136.11 with SMTP id d11mr1821401wrd.73.1499844891844; Wed, 12 Jul 2017 00:34:51 -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 d1sm2080491wra.43.2017.07.12.00.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 00:34:51 -0700 (PDT) From: Corentin Labbe To: peppe.cavallaro@st.com, alexandre.torgue@st.com, maxime.ripard@free-electrons.com, wens@csie.org Subject: [PATCH] net: stmmac: revert "support future possible different internal phy mode" Date: Wed, 12 Jul 2017 09:32:34 +0200 Message-Id: <20170712073234.9809-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170712_003514_801975_56A89B25 X-CRM114-Status: GOOD ( 12.04 ) 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: netdev@vger.kernel.org, Corentin Labbe , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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 Since internal phy-mode is reserved for non-xMII protocol we cannot use it with dwmac-sun8i. Furthermore, all DT patchs which comes with this patch were cleaned, so the current state is broken. This reverts commit 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") Fixes: 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") Signed-off-by: Corentin Labbe --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 6c2d1da05588..fffd6d5fc907 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -638,7 +638,7 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) { struct sunxi_priv_data *gmac = priv->plat->bsp_priv; struct device_node *node = priv->device->of_node; - int ret, phy_interface; + int ret; u32 reg, val; regmap_read(gmac->regmap, SYSCON_EMAC_REG, &val); @@ -718,11 +718,7 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) if (gmac->variant->support_rmii) reg &= ~SYSCON_RMII_EN; - phy_interface = priv->plat->interface; - /* if PHY is internal, select the mode (xMII) used by the SoC */ - if (gmac->use_internal_phy) - phy_interface = gmac->variant->internal_phy; - switch (phy_interface) { + switch (priv->plat->interface) { case PHY_INTERFACE_MODE_MII: /* default */ break; @@ -936,7 +932,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) } plat_dat->interface = of_get_phy_mode(dev->of_node); - if (plat_dat->interface == PHY_INTERFACE_MODE_INTERNAL) { + if (plat_dat->interface == gmac->variant->internal_phy) { dev_info(&pdev->dev, "Will use internal PHY\n"); gmac->use_internal_phy = true; gmac->ephy_clk = of_clk_get(plat_dat->phy_node, 0);