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: 787040 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x6rMN5vykz9s81 for ; Wed, 12 Jul 2017 17:35:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sOZv8WKL"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756843AbdGLHez (ORCPT ); Wed, 12 Jul 2017 03:34:55 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36016 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756657AbdGLHex (ORCPT ); Wed, 12 Jul 2017 03:34:53 -0400 Received: by mail-wr0-f195.google.com with SMTP id 77so3740731wrb.3; Wed, 12 Jul 2017 00:34:52 -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=OfSXEPn72UNGId95IeCAJcIxckW1F7h0fYMlGfJ4KErnMkw4xsufZ4ya26110q6JlR YdMk/HlkiFzBhpLnKEj+87mi03FQAgoodrRMiW7OHrbDIy8vrg+LMrjODl4LRtVHgkqf UhqSKYhmgW8NRP5DhZKyu/RBkDQltMCF0XJGOls7r9pFXOG3VqS/ySYlbih6XJfttIdk qQw6BEH7ulIhS7QlEJr9g+1GlS3hf76B3Vj0YPCEls7AUvDnh0gTcEi6D8cL8qVkQrTh 9Hv9rwG47xGuWgXALWcCkEj0umkGGVug1fBHIU2UFYRmUgKB2eunjMg2UMIUilnXC8zr rNdg== X-Gm-Message-State: AIVw1124h2SAe/ZMlyXX0qyb9cuupfCXUprQKgtWf5W27sDEVsRoqxat XeWXVWrFSYWwPQ== 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 Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe 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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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);