From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Fabio Estevam <festevam@gmail.com>,
imx@lists.linux.dev, Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Sascha Hauer <s.hauer@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>
Subject: [PATCH net-next 07/11] net: stmmac: imx: use generic stmmac_set_clk_tx_rate()
Date: Thu, 27 Feb 2025 09:16:54 +0000 [thread overview]
Message-ID: <E1tna0k-0052t2-Cc@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z8AtX-wyPal1auVO@shell.armlinux.org.uk>
Convert non-i.MX93 users to use the generic stmmac_set_clk_tx_rate() to
configure the MAC transmit clock rate.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index 610204b51e3f..5d279fa54b3e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -192,6 +192,19 @@ static void imx_dwmac_exit(struct platform_device *pdev, void *priv)
/* nothing to do now */
}
+static int imx_dwmac_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
+ phy_interface_t interface, int speed)
+{
+ struct imx_priv_data *dwmac = bsp_priv;
+
+ interface = dwmac->plat_dat->mac_interface;
+ if (interface == PHY_INTERFACE_MODE_RMII ||
+ interface == PHY_INTERFACE_MODE_MII)
+ return 0;
+
+ return stmmac_set_clk_tx_rate(bsp_priv, clk_tx_i, interface, speed);
+}
+
static void imx_dwmac_fix_speed(void *priv, int speed, unsigned int mode)
{
struct plat_stmmacenet_data *plat_dat;
@@ -358,7 +371,6 @@ static int imx_dwmac_probe(struct platform_device *pdev)
plat_dat->init = imx_dwmac_init;
plat_dat->exit = imx_dwmac_exit;
plat_dat->clks_config = imx_dwmac_clks_config;
- plat_dat->fix_mac_speed = imx_dwmac_fix_speed;
plat_dat->bsp_priv = dwmac;
dwmac->plat_dat = plat_dat;
dwmac->base_addr = stmmac_res.addr;
@@ -371,8 +383,13 @@ static int imx_dwmac_probe(struct platform_device *pdev)
if (ret)
goto err_dwmac_init;
- if (dwmac->ops->fix_mac_speed)
+ if (dwmac->ops->fix_mac_speed) {
plat_dat->fix_mac_speed = dwmac->ops->fix_mac_speed;
+ } else if (!dwmac->ops->mac_rgmii_txclk_auto_adj) {
+ plat_dat->clk_tx_i = dwmac->clk_tx;
+ plat_dat->set_clk_tx_rate = imx_dwmac_set_clk_tx_rate;
+ }
+
dwmac->plat_dat->fix_soc_reset = dwmac->ops->fix_soc_reset;
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
--
2.30.2
next prev parent reply other threads:[~2025-02-27 9:17 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 9:16 [PATCH net-next 00/11] net: stmmac: cleanup transmit clock setting Russell King (Oracle)
2025-02-27 9:16 ` Russell King (Oracle)
2025-02-27 9:16 ` Russell King (Oracle)
2025-02-27 9:16 ` [PATCH net-next 01/11] net: stmmac: provide set_clk_tx_rate() hook Russell King (Oracle)
2025-02-27 13:57 ` Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 02/11] net: stmmac: provide generic implementation for set_clk_tx_rate method Russell King (Oracle)
2025-02-27 13:58 ` Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 03/11] net: stmmac: dwc-qos: use generic stmmac_set_clk_tx_rate() Russell King (Oracle)
2025-02-27 13:58 ` Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 04/11] net: stmmac: starfive: " Russell King (Oracle)
2025-02-27 13:59 ` Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 05/11] net: stmmac: s32: " Russell King (Oracle)
2025-02-27 14:00 ` Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 06/11] net: stmmac: intel: " Russell King (Oracle)
2025-02-27 14:00 ` Andrew Lunn
2025-02-27 9:16 ` Russell King (Oracle) [this message]
2025-02-27 14:01 ` [PATCH net-next 07/11] net: stmmac: imx: " Andrew Lunn
2025-02-27 9:16 ` [PATCH net-next 08/11] net: stmmac: rk: switch to use set_clk_tx_rate() hook Russell King (Oracle)
2025-02-27 14:02 ` Andrew Lunn
2025-02-27 9:17 ` [PATCH net-next 09/11] net: stmmac: ipq806x: " Russell King (Oracle)
2025-02-27 14:02 ` Andrew Lunn
2025-02-27 9:17 ` [PATCH net-next 10/11] net: stmmac: meson: " Russell King (Oracle)
2025-02-27 9:17 ` Russell King (Oracle)
2025-02-27 14:03 ` Andrew Lunn
2025-02-27 14:03 ` Andrew Lunn
2025-02-27 14:18 ` Neil Armstrong
2025-02-27 14:18 ` Neil Armstrong
2025-02-27 14:35 ` Russell King (Oracle)
2025-02-27 14:35 ` Russell King (Oracle)
2025-02-27 14:38 ` Neil Armstrong
2025-02-27 14:38 ` Neil Armstrong
2025-02-27 14:56 ` Russell King (Oracle)
2025-02-27 14:56 ` Russell King (Oracle)
2025-02-27 9:17 ` [PATCH net-next 11/11] net: stmmac: thead: " Russell King (Oracle)
2025-02-27 9:17 ` Russell King (Oracle)
2025-02-27 14:04 ` Andrew Lunn
2025-02-27 14:04 ` Andrew Lunn
2025-02-28 18:30 ` [PATCH net-next 00/11] net: stmmac: cleanup transmit clock setting patchwork-bot+netdevbpf
2025-02-28 18:30 ` patchwork-bot+netdevbpf
2025-02-28 18:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1tna0k-0052t2-Cc@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=festevam@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.