Commit 56868dee authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller

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

Implement the needed PM callbacks 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>
Tested-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4e7bd81
...@@ -261,7 +261,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) ...@@ -261,7 +261,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
} }
plat_dat->bsp_priv = dwmac; plat_dat->bsp_priv = dwmac;
plat_dat->init = socfpga_dwmac_init;
plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed; plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed;
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
...@@ -271,6 +270,21 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) ...@@ -271,6 +270,21 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
return ret; return ret;
} }
#ifdef CONFIG_PM_SLEEP
static int socfpga_dwmac_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct net_device *ndev = dev_get_drvdata(dev);
struct stmmac_priv *priv = netdev_priv(ndev);
socfpga_dwmac_init(pdev, priv->plat->bsp_priv);
return stmmac_resume(dev);
}
#endif /* CONFIG_PM_SLEEP */
SIMPLE_DEV_PM_OPS(socfpga_dwmac_pm_ops, stmmac_suspend, socfpga_dwmac_resume);
static const struct of_device_id socfpga_dwmac_match[] = { static const struct of_device_id socfpga_dwmac_match[] = {
{ .compatible = "altr,socfpga-stmmac" }, { .compatible = "altr,socfpga-stmmac" },
{ } { }
...@@ -282,7 +296,7 @@ static struct platform_driver socfpga_dwmac_driver = { ...@@ -282,7 +296,7 @@ static struct platform_driver socfpga_dwmac_driver = {
.remove = stmmac_pltfr_remove, .remove = stmmac_pltfr_remove,
.driver = { .driver = {
.name = "socfpga-dwmac", .name = "socfpga-dwmac",
.pm = &stmmac_pltfr_pm_ops, .pm = &socfpga_dwmac_pm_ops,
.of_match_table = socfpga_dwmac_match, .of_match_table = socfpga_dwmac_match,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment