Commit da59ceed authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-sti-cleanups' 

Russell King says:

====================
net: stmmac: sti cleanups

Clean up the STI platform glue code.

- IS_PHY_IF_MODE_RGMII() is just a duplicate for
  phy_interface_mode_is_rgmii(), so use the generic version that we
  already have.

- add init/exit functions that call clk_prepare_enable(),
  sti_dwmac_set_mode() and clk_disable_unprepare() as appropriate,
  converting to devm_stmmac_pltfr_probe().

- the custom suspend/resume ops do basically what the generic ones
  do with init/exit functions populated, but also add runtime and
  noirq ops. Update STI to use the generic ops.
====================

Link: https://patch.msgid.link/Z_6Mfx_SrionoU-e@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 49593c29 b3334f9f

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

+29 −59
Original line number Diff line number Diff line
@@ -23,12 +23,7 @@ 


#define DWMAC_50MHZ	50000000



#define IS_PHY_IF_MODE_RGMII(iface)	(iface == PHY_INTERFACE_MODE_RGMII || \

			iface == PHY_INTERFACE_MODE_RGMII_ID || \

			iface == PHY_INTERFACE_MODE_RGMII_RXID || \

			iface == PHY_INTERFACE_MODE_RGMII_TXID)



#define IS_PHY_IF_MODE_GBIT(iface)	(IS_PHY_IF_MODE_RGMII(iface) || \

#define IS_PHY_IF_MODE_GBIT(iface)	(phy_interface_mode_is_rgmii(iface) || \

					 iface == PHY_INTERFACE_MODE_GMII)



/* STiH4xx register definitions (STiH407/STiH410 families)
@@ -148,7 +143,7 @@ static void stih4xx_fix_retime_src(void *priv, int spd, unsigned int mode) 
			src = TX_RETIME_SRC_CLKGEN;

			freq = DWMAC_50MHZ;

		}

	} else if (IS_PHY_IF_MODE_RGMII(dwmac->interface)) {

	} else if (phy_interface_mode_is_rgmii(dwmac->interface)) {

		/* On GiGa clk source can be either ext or from clkgen */

		freq = rgmii_clock(spd);
@@ -238,6 +233,29 @@ static int sti_dwmac_parse_data(struct sti_dwmac *dwmac, 
	return 0;

}



static int sti_dwmac_init(struct platform_device *pdev, void *bsp_priv)

{

	struct sti_dwmac *dwmac = bsp_priv;

	int ret;



	ret = clk_prepare_enable(dwmac->clk);

	if (ret)

		return ret;



	ret = sti_dwmac_set_mode(dwmac);

	if (ret)

		clk_disable_unprepare(dwmac->clk);



	return ret;

}



static void sti_dwmac_exit(struct platform_device *pdev, void *bsp_priv)

{

	struct sti_dwmac *dwmac = bsp_priv;



	clk_disable_unprepare(dwmac->clk);

}



static int sti_dwmac_probe(struct platform_device *pdev)

{

	struct plat_stmmacenet_data *plat_dat;
@@ -274,59 +292,12 @@ static int sti_dwmac_probe(struct platform_device *pdev) 


	plat_dat->bsp_priv = dwmac;

	plat_dat->fix_mac_speed = data->fix_retime_src;

	plat_dat->init = sti_dwmac_init;

	plat_dat->exit = sti_dwmac_exit;



	ret = clk_prepare_enable(dwmac->clk);

	if (ret)

		return ret;



	ret = sti_dwmac_set_mode(dwmac);

	if (ret)

		goto disable_clk;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret)

		goto disable_clk;



	return 0;



disable_clk:

	clk_disable_unprepare(dwmac->clk);



	return ret;

}



static void sti_dwmac_remove(struct platform_device *pdev)

{

	struct sti_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);



	stmmac_dvr_remove(&pdev->dev);



	clk_disable_unprepare(dwmac->clk);

	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}



static int sti_dwmac_suspend(struct device *dev)

{

	struct sti_dwmac *dwmac = get_stmmac_bsp_priv(dev);

	int ret = stmmac_suspend(dev);



	clk_disable_unprepare(dwmac->clk);



	return ret;

}



static int sti_dwmac_resume(struct device *dev)

{

	struct sti_dwmac *dwmac = get_stmmac_bsp_priv(dev);



	clk_prepare_enable(dwmac->clk);

	sti_dwmac_set_mode(dwmac);



	return stmmac_resume(dev);

}



static DEFINE_SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend,

						  sti_dwmac_resume);



static const struct sti_dwmac_of_data stih4xx_dwmac_data = {

	.fix_retime_src = stih4xx_fix_retime_src,

};
@@ -339,10 +310,9 @@ MODULE_DEVICE_TABLE(of, sti_dwmac_match); 


static struct platform_driver sti_dwmac_driver = {

	.probe  = sti_dwmac_probe,

	.remove = sti_dwmac_remove,

	.driver = {

		.name           = "sti-dwmac",

		.pm		= pm_sleep_ptr(&sti_dwmac_pm_ops),

		.pm		= &stmmac_pltfr_pm_ops,

		.of_match_table = sti_dwmac_match,

	},

};