Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2517cfd4 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: dwmac-sti: add PM ops and resume function 



Implement PM callbacks and driver remove in the driver instead
of relying on the init/exit hooks in stmmac_platform. This gives
the driver more flexibility in how the code is organized.

Eventually the init/exit callbacks will be deprecated in favor
of the standard PM callbacks and driver remove function.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Tested-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b211aa65

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

+37 −10
Original line number Diff line number Diff line
@@ -253,12 +253,6 @@ static int sti_dwmac_init(struct platform_device *pdev, void *priv) 
	return 0;

}



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

{

	struct sti_dwmac *dwmac = priv;



	clk_disable_unprepare(dwmac->clk);

}

static int sti_dwmac_parse_data(struct sti_dwmac *dwmac,

				struct platform_device *pdev)

{
@@ -352,8 +346,6 @@ static int sti_dwmac_probe(struct platform_device *pdev) 
	dwmac->fix_retime_src = data->fix_retime_src;



	plat_dat->bsp_priv = dwmac;

	plat_dat->init = sti_dwmac_init;

	plat_dat->exit = sti_dwmac_exit;

	plat_dat->fix_mac_speed = data->fix_retime_src;



	ret = sti_dwmac_init(pdev, plat_dat->bsp_priv);
@@ -363,6 +355,41 @@ static int sti_dwmac_probe(struct platform_device *pdev) 
	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}



static int sti_dwmac_remove(struct platform_device *pdev)

{

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

	int ret = stmmac_dvr_remove(&pdev->dev);



	clk_disable_unprepare(dwmac->clk);



	return ret;

}



#ifdef CONFIG_PM_SLEEP

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);

	struct platform_device *pdev = to_platform_device(dev);



	sti_dwmac_init(pdev, dwmac);



	return stmmac_resume(dev);

}

#endif /* CONFIG_PM_SLEEP */



static 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,

};
@@ -382,10 +409,10 @@ MODULE_DEVICE_TABLE(of, sti_dwmac_match); 


static struct platform_driver sti_dwmac_driver = {

	.probe  = sti_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove = sti_dwmac_remove,

	.driver = {

		.name           = "sti-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

		.pm		= &sti_dwmac_pm_ops,

		.of_match_table = sti_dwmac_match,

	},

};