Commit 8f2f8376 authored by Joakim Zhang's avatar Joakim Zhang Committed by David S. Miller
Browse files

net: stmmac: dwmac-imx: add platform level clocks management for i.MX 



Split clocks settings from init callback into clks_config callback,
which could support platform level clocks management.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4d45aee

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

+36 −24
Original line number Diff line number Diff line
@@ -90,47 +90,52 @@ imx8dxl_set_intf_mode(struct plat_stmmacenet_data *plat_dat) 
	return ret;

}



static int imx_dwmac_init(struct platform_device *pdev, void *priv)

static int imx_dwmac_clks_config(void *priv, bool enabled)

{

	struct plat_stmmacenet_data *plat_dat;

	struct imx_priv_data *dwmac = priv;

	int ret;



	plat_dat = dwmac->plat_dat;

	int ret = 0;



	if (enabled) {

		ret = clk_prepare_enable(dwmac->clk_mem);

		if (ret) {

		dev_err(&pdev->dev, "mem clock enable failed\n");

			dev_err(dwmac->dev, "mem clock enable failed\n");

			return ret;

		}



		ret = clk_prepare_enable(dwmac->clk_tx);

		if (ret) {

		dev_err(&pdev->dev, "tx clock enable failed\n");

		goto clk_tx_en_failed;

			dev_err(dwmac->dev, "tx clock enable failed\n");

			clk_disable_unprepare(dwmac->clk_mem);

			return ret;

		}

	} else {

		clk_disable_unprepare(dwmac->clk_tx);

		clk_disable_unprepare(dwmac->clk_mem);

	}



	return ret;

}



static int imx_dwmac_init(struct platform_device *pdev, void *priv)

{

	struct plat_stmmacenet_data *plat_dat;

	struct imx_priv_data *dwmac = priv;

	int ret;



	plat_dat = dwmac->plat_dat;



	if (dwmac->ops->set_intf_mode) {

		ret = dwmac->ops->set_intf_mode(plat_dat);

		if (ret)

			goto intf_mode_failed;

			return ret;

	}



	return 0;



intf_mode_failed:

	clk_disable_unprepare(dwmac->clk_tx);

clk_tx_en_failed:

	clk_disable_unprepare(dwmac->clk_mem);

	return ret;

}



static void imx_dwmac_exit(struct platform_device *pdev, void *priv)

{

	struct imx_priv_data *dwmac = priv;



	clk_disable_unprepare(dwmac->clk_tx);

	clk_disable_unprepare(dwmac->clk_mem);

	/* nothing to do now */

}



static void imx_dwmac_fix_speed(void *priv, unsigned int speed)
@@ -249,10 +254,15 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	plat_dat->addr64 = dwmac->ops->addr_width;

	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;



	ret = imx_dwmac_clks_config(dwmac, true);

	if (ret)

		goto err_clks_config;



	ret = imx_dwmac_init(pdev, dwmac);

	if (ret)

		goto err_dwmac_init;
@@ -263,9 +273,11 @@ static int imx_dwmac_probe(struct platform_device *pdev) 


	return 0;



err_dwmac_init:

err_drv_probe:

	imx_dwmac_exit(pdev, plat_dat->bsp_priv);

err_dwmac_init:

	imx_dwmac_clks_config(dwmac, false);

err_clks_config:

err_parse_dt:

err_match_data:

	stmmac_remove_config_dt(pdev, plat_dat);