Commit b693ce4f authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: imx: use generic stmmac_set_clk_tx_rate() 



Convert non-i.MX93 users to use the generic stmmac_set_clk_tx_rate() to
configure the MAC transmit clock rate.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1tna0k-0052t2-Cc@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 61356fb1

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c

+19 −2
Original line number Diff line number Diff line
@@ -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);