[PATCH v2 21/24] net: stmmac: dwmac-imx: Discard Tx clock request

Serge Semin
2021-02-08T14:14:06Z

Since the Tx clock is now requested and enabled/disabled in the STMMAC
DT-based platform config method, there is no need in duplicating the same
procedures in the DW MAC iMX sub-driver.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 21 +++++--------------
1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index 223f69da7e95..8b2c7f1ba745 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -40,7 +40,6 @@ struct imx_dwmac_ops {

struct imx_priv_data {
struct device *dev;
- struct clk *clk_tx;
struct clk *clk_mem;
struct regmap *intf_regmap;
u32 intf_reg_off;
@@ -104,12 +103,6 @@ static int imx_dwmac_init(struct platform_device *pdev, void *priv)
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;
- }
-
if (dwmac->ops->set_intf_mode) {
ret = dwmac->ops->set_intf_mode(plat_dat);
if (ret)
@@ -119,8 +112,6 @@ static int imx_dwmac_init(struct platform_device *pdev, void *priv)
return 0;

intf_mode_failed:
- clk_disable_unprepare(dwmac->clk_tx);
-clk_tx_en_failed:
clk_disable_unprepare(dwmac->clk_mem);
return ret;
}
@@ -129,7 +120,6 @@ 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);
}

@@ -162,7 +152,7 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed)
return;
}

- err = clk_set_rate(dwmac->clk_tx, rate);
+ err = clk_set_rate(plat_dat->tx_clk, rate);
if (err < 0)
dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
}
@@ -176,10 +166,9 @@ imx_dwmac_parse_dt(struct imx_priv_data *dwmac, struct device *dev)
if (of_get_property(np, "snps,rmii_refclk_ext", NULL))
dwmac->rmii_refclk_ext = true;

- dwmac->clk_tx = devm_clk_get(dev, "tx");
- if (IS_ERR(dwmac->clk_tx)) {
- dev_err(dev, "failed to get tx clock\n");
- return PTR_ERR(dwmac->clk_tx);
+ if (!dwmac->plat_dat->tx_clk) {
+ dev_err(dev, "no tx clock found\n");
+ return -EINVAL;
}

dwmac->clk_mem = NULL;
@@ -239,6 +228,7 @@ static int imx_dwmac_probe(struct platform_device *pdev)

dwmac->ops = data;
dwmac->dev = &pdev->dev;
+ dwmac->plat_dat = plat_dat;

ret = imx_dwmac_parse_dt(dwmac, &pdev->dev);
if (ret) {
@@ -251,7 +241,6 @@ static int imx_dwmac_probe(struct platform_device *pdev)
plat_dat->exit = imx_dwmac_exit;
plat_dat->fix_mac_speed = imx_dwmac_fix_speed;
plat_dat->bsp_priv = dwmac;
- dwmac->plat_dat = plat_dat;

ret = imx_dwmac_init(pdev, dwmac);
if (ret)
--
2.29.2