| Message ID | E1tkLZG-004RZb-8Y@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: stmmac: cleanup transmit clock setting | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/apply | fail | Patch does not apply to net-next-0 |
On Tue, Feb 18, 2025 at 11:15:10AM +0000, Russell King (Oracle) wrote: > 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> Looking at this again, this patch is not correct - imx does a few checks before changing the "tx" clock.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c index 610204b51e3f..927ce8d97f78 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c @@ -358,7 +358,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 +370,12 @@ static int imx_dwmac_probe(struct platform_device *pdev) if (ret) goto err_dwmac_init; + plat_dat->clk_tx_i = dwmac->clk_tx; if (dwmac->ops->fix_mac_speed) plat_dat->fix_mac_speed = dwmac->ops->fix_mac_speed; + else + plat_dat->set_clk_tx_rate = stmmac_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);
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> --- drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)