From patchwork Mon Jan 15 17:10:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10164865 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 ED963602C2 for ; Mon, 15 Jan 2018 17:11:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D60252040D for ; Mon, 15 Jan 2018 17:11:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAC5A204FD; Mon, 15 Jan 2018 17:11:04 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED 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 1F3962040D for ; Mon, 15 Jan 2018 17:11:04 +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=HGt08fG8LjPl07UdIjlhZUSAOkb9ci2KivYtVQG8Sjc=; b=Oqh5zE3Z1dCU20OkQ/P17eHr3f hxCA4MLe4UjKKs9wTHXIRKU5dT32cosFdnteD71f3rnVdHtcxkDRwkYkCLH/uiGu6sZgLmkUJ2iBw QyUmziN6UuxCYrWfYvZ0uYmpsPz88Q0DeNKvmV7nJXPBBpQDK5bJ2oWCXmvzR422q+/2Mz3MRSHVD I/Jg/xo5INHDpqazdlaUy/f9NkZxNR550ky1FFjYkgZImCXKBCP+qA967SuNdTauoZ8jpAXHu6ISW LWyANf28Ee2/HSINcyHKlNyIS5HDBsg4Lq3oqrBLaQ95nbcfvhZgOYc/kLbtgatP1gBmU91E1p7o0 M481QctA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eb8He-0004g6-ES; Mon, 15 Jan 2018 17:10:54 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eb8HV-0004ZK-KK for linux-amlogic@lists.infradead.org; Mon, 15 Jan 2018 17:10:52 +0000 Received: by mail-wr0-x244.google.com with SMTP id f11so1969742wre.4 for ; Mon, 15 Jan 2018 09:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6xqg0g/QXeIhvVbtEGiaxCGXeNk3j97f6FztZF/vbFc=; b=O5f6fghLaAd5Gvk4Z05ODOPYF8AUpQwEkbaudhsAw3WGT5zL7luMxLH8jHE5F0qBv7 OquaZnsiVRlScpdkjFkgPO3nq8G5uzAJ1MoZE9kALjMcdxI2lx6NYwSgiLjfJnz02lNR LqwDzRIJcIwtXvRC8hAzC3R1z03L2IPSZAuZRC/RzowH+WWTO+xEBR9pQZeaajbicNz9 /sT/fQwjzEk7XVxEkZL/ie3zkaemyf4fVe6FRK5QoubT+jZyg6GYUAl7vlr1LBKX592N cT/0LbECiIUqZIHjg6xddPQ0MHxd3JlBhxX7iLb+llVS19+vg3wYye3I19XEiQWpqw/c p9DA== 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=6xqg0g/QXeIhvVbtEGiaxCGXeNk3j97f6FztZF/vbFc=; b=miF68AAYacq4F4kErHdjZlRTmLbjMWqjKq+vT3EEkUSRE8fcS4dwbrHBYrQYS+tNDq OK4DvrhGMYCT59RUf/LbwjEIBEqr7d49Wg1jGryUzjXpDbzHuBjNLuz0aqsIuOSxmlQG gCFes4CsABEXv7FOsHs6Jxt1zZGJCIxNOP50u0kqNqYgucVJmGF3o2Y7FMIKnGBjzYc3 y5MfFOX124H1p2mRnUGvemkYoINbpefVDWrvp1114HYzHBIhiEHxctNAUUWCXZvmYps6 SYG4+9zSzzU62ByqtEadm7GFzmO5giEvwTQ0b72JdfLbuWlU/deB4cBMjjg+4NuPXzzX gN5Q== X-Gm-Message-State: AKwxytcuty3HgF7jAvwKFkQUnUNTJBejP4AqayeVQeUKZ5TIRxkEieVF wgyMT11gnFBspwxytuGPm3E= X-Google-Smtp-Source: ACJfBos89MRAJTMr/gP6CP/xPOxen2x7vhaj0jC+syLiZCpPLsvO1ibqdild85MOmwXmxirfKEKSrw== X-Received: by 10.223.152.150 with SMTP id w22mr2182080wrb.74.1516036233735; Mon, 15 Jan 2018 09:10:33 -0800 (PST) Received: from blackbox.darklights.net (p5DD9BF25.dip0.t-ipconnect.de. [93.217.191.37]) by smtp.googlemail.com with ESMTPSA id c11sm142716wrc.8.2018.01.15.09.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 09:10:32 -0800 (PST) From: Martin Blumenstingl To: davem@davemloft.net, netdev@vger.kernel.org, ingrassia@epigenesys.com Subject: [PATCH net-next v5 1/4] net: stmmac: dwmac-meson8b: only configure the clocks in RGMII mode Date: Mon, 15 Jan 2018 18:10:12 +0100 Message-Id: <20180115171015.1118-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115171015.1118-1-martin.blumenstingl@googlemail.com> References: <20180115171015.1118-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180115_091045_675106_E52721B0 X-CRM114-Status: GOOD ( 14.89 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linus.luessing@c0d3.blue, narmstrong@baylibre.com, Martin Blumenstingl , khilman@baylibre.com, alexandre.torgue@st.com, linux-amlogic@lists.infradead.org, peppe.cavallaro@st.com, jbrunet@baylibre.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Neither the m25_div_clk nor the m250_div_clk or m250_mux_clk are used in RMII mode. The m25_div_clk output is routed to the RGMII PHY's "RGMII clock". This means that we don't need to configure the clocks in RMII mode. The driver however did this - with no effect since the clocks are not routed to the PHY in RMII mode. While here also rename meson8b_init_clk to meson8b_init_rgmii_tx_clk to make it easier to understand the code. Fixes: 566e8251625304 ("net: stmmac: add a glue driver for the Amlogic Meson 8b / GXBB DWMAC") Signed-off-by: Martin Blumenstingl Tested-by: Jerome Brunet --- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 46 ++++++++++------------ 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index 4404650b32c5..c6f87e9c4ccb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -81,7 +81,7 @@ static void meson8b_dwmac_mask_bits(struct meson8b_dwmac *dwmac, u32 reg, writel(data, dwmac->regs + reg); } -static int meson8b_init_clk(struct meson8b_dwmac *dwmac) +static int meson8b_init_rgmii_tx_clk(struct meson8b_dwmac *dwmac) { struct clk_init_data init; int i, ret; @@ -176,7 +176,6 @@ static int meson8b_init_clk(struct meson8b_dwmac *dwmac) static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) { int ret; - unsigned long clk_rate; u8 tx_dly_val = 0; switch (dwmac->phy_mode) { @@ -191,9 +190,6 @@ static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_TXID: - /* Generate a 25MHz clock for the PHY */ - clk_rate = 25 * 1000 * 1000; - /* enable RGMII mode */ meson8b_dwmac_mask_bits(dwmac, PRG_ETH0, PRG_ETH0_RGMII_MODE, PRG_ETH0_RGMII_MODE); @@ -204,12 +200,24 @@ static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) meson8b_dwmac_mask_bits(dwmac, PRG_ETH0, PRG_ETH0_TXDLY_MASK, tx_dly_val << PRG_ETH0_TXDLY_SHIFT); + + ret = clk_prepare_enable(dwmac->m25_div_clk); + if (ret) { + dev_err(&dwmac->pdev->dev, "failed to enable the PHY clock\n"); + return ret; + } + + /* Generate the 25MHz RGMII clock for the PHY */ + ret = clk_set_rate(dwmac->m25_div_clk, 25 * 1000 * 1000); + if (ret) { + clk_disable_unprepare(dwmac->m25_div_clk); + + dev_err(&dwmac->pdev->dev, "failed to set PHY clock\n"); + return ret; + } break; case PHY_INTERFACE_MODE_RMII: - /* Use the rate of the mux clock for the internal RMII PHY */ - clk_rate = clk_get_rate(dwmac->m250_mux_clk); - /* disable RGMII mode -> enables RMII mode */ meson8b_dwmac_mask_bits(dwmac, PRG_ETH0, PRG_ETH0_RGMII_MODE, 0); @@ -231,20 +239,6 @@ static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) return -EINVAL; } - ret = clk_prepare_enable(dwmac->m25_div_clk); - if (ret) { - dev_err(&dwmac->pdev->dev, "failed to enable the PHY clock\n"); - return ret; - } - - ret = clk_set_rate(dwmac->m25_div_clk, clk_rate); - if (ret) { - clk_disable_unprepare(dwmac->m25_div_clk); - - dev_err(&dwmac->pdev->dev, "failed to set PHY clock\n"); - return ret; - } - /* enable TX_CLK and PHY_REF_CLK generator */ meson8b_dwmac_mask_bits(dwmac, PRG_ETH0, PRG_ETH0_TX_AND_PHY_REF_CLK, PRG_ETH0_TX_AND_PHY_REF_CLK); @@ -294,7 +288,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) &dwmac->tx_delay_ns)) dwmac->tx_delay_ns = 2; - ret = meson8b_init_clk(dwmac); + ret = meson8b_init_rgmii_tx_clk(dwmac); if (ret) goto err_remove_config_dt; @@ -311,7 +305,8 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) return 0; err_clk_disable: - clk_disable_unprepare(dwmac->m25_div_clk); + if (phy_interface_mode_is_rgmii(dwmac->phy_mode)) + clk_disable_unprepare(dwmac->m25_div_clk); err_remove_config_dt: stmmac_remove_config_dt(pdev, plat_dat); @@ -322,7 +317,8 @@ static int meson8b_dwmac_remove(struct platform_device *pdev) { struct meson8b_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev); - clk_disable_unprepare(dwmac->m25_div_clk); + if (phy_interface_mode_is_rgmii(dwmac->phy_mode)) + clk_disable_unprepare(dwmac->m25_div_clk); return stmmac_pltfr_remove(pdev); }