Commit 35887d32 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-dwmac-rk-PM' 



Joachim Eastwood says:

====================
stmmac: dwmac-rk: convert to standard PM/remove functions

This patch set aims to remove the init/exit callbacks from the
dwmac-rk driver and instead use standard PM callbacks. Eventually
the init/exit callbacks will be deprecated and removed from all
drivers dwmac-* except for dwmac-generic. Drivers will be refactored
to use standard PM and remove callbacks.

This conversion was pretty straight forward, but it would really nice
if some chromium people could test suspend/resume with this patch set.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c68d7f1b 5a3c7805

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

+44 −45
Original line number Diff line number Diff line
@@ -901,44 +901,6 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac) 
	gmac_clk_enable(gmac, false);

}



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

{

	struct rk_priv_data *bsp_priv = priv;



	return rk_gmac_powerup(bsp_priv);

}



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

{

	struct rk_priv_data *bsp_priv = priv;



	rk_gmac_powerdown(bsp_priv);

}



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

{

	struct rk_priv_data *bsp_priv = priv;



	/* Keep the PHY up if we use Wake-on-Lan. */

	if (device_may_wakeup(&pdev->dev))

		return;



	rk_gmac_powerdown(bsp_priv);

	bsp_priv->suspended = true;

}



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

{

	struct rk_priv_data *bsp_priv = priv;



	/* The PHY was up for Wake-on-Lan. */

	if (!bsp_priv->suspended)

		return;



	rk_gmac_powerup(bsp_priv);

	bsp_priv->suspended = false;

}



static void rk_fix_speed(void *priv, unsigned int speed)

{

	struct rk_priv_data *bsp_priv = priv;
@@ -974,23 +936,60 @@ static int rk_gmac_probe(struct platform_device *pdev) 
		return PTR_ERR(plat_dat);



	plat_dat->has_gmac = true;

	plat_dat->init = rk_gmac_init;

	plat_dat->exit = rk_gmac_exit;

	plat_dat->fix_mac_speed = rk_fix_speed;

	plat_dat->suspend = rk_gmac_suspend;

	plat_dat->resume = rk_gmac_resume;



	plat_dat->bsp_priv = rk_gmac_setup(pdev, data);

	if (IS_ERR(plat_dat->bsp_priv))

		return PTR_ERR(plat_dat->bsp_priv);



	ret = rk_gmac_init(pdev, plat_dat->bsp_priv);

	ret = rk_gmac_powerup(plat_dat->bsp_priv);

	if (ret)

		return ret;



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

}



static int rk_gmac_remove(struct platform_device *pdev)

{

	struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev);

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



	rk_gmac_powerdown(bsp_priv);



	return ret;

}



#ifdef CONFIG_PM_SLEEP

static int rk_gmac_suspend(struct device *dev)

{

	struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev);

	int ret = stmmac_suspend(dev);



	/* Keep the PHY up if we use Wake-on-Lan. */

	if (!device_may_wakeup(dev)) {

		rk_gmac_powerdown(bsp_priv);

		bsp_priv->suspended = true;

	}



	return ret;

}



static int rk_gmac_resume(struct device *dev)

{

	struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev);



	/* The PHY was up for Wake-on-Lan. */

	if (bsp_priv->suspended) {

		rk_gmac_powerup(bsp_priv);

		bsp_priv->suspended = false;

	}



	return stmmac_resume(dev);

}

#endif /* CONFIG_PM_SLEEP */



static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume);



static const struct of_device_id rk_gmac_dwmac_match[] = {

	{ .compatible = "rockchip,rk3228-gmac", .data = &rk3228_ops },

	{ .compatible = "rockchip,rk3288-gmac", .data = &rk3288_ops },
@@ -1003,10 +1002,10 @@ MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); 


static struct platform_driver rk_gmac_dwmac_driver = {

	.probe  = rk_gmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove = rk_gmac_remove,

	.driver = {

		.name           = "rk_gmac-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

		.pm		= &rk_gmac_pm_ops,

		.of_match_table = rk_gmac_dwmac_match,

	},

};

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+2 −6
Original line number Diff line number Diff line
@@ -417,9 +417,7 @@ static int stmmac_pltfr_suspend(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);



	ret = stmmac_suspend(dev);

	if (priv->plat->suspend)

		priv->plat->suspend(pdev, priv->plat->bsp_priv);

	else if (priv->plat->exit)

	if (priv->plat->exit)

		priv->plat->exit(pdev, priv->plat->bsp_priv);



	return ret;
@@ -438,9 +436,7 @@ static int stmmac_pltfr_resume(struct device *dev) 
	struct stmmac_priv *priv = netdev_priv(ndev);

	struct platform_device *pdev = to_platform_device(dev);



	if (priv->plat->resume)

		priv->plat->resume(pdev, priv->plat->bsp_priv);

	else if (priv->plat->init)

	if (priv->plat->init)

		priv->plat->init(pdev, priv->plat->bsp_priv);



	return stmmac_resume(dev);

include/linux/stmmac.h

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ struct plat_stmmacenet_data { 
	void (*bus_setup)(void __iomem *ioaddr);

	int (*init)(struct platform_device *pdev, void *priv);

	void (*exit)(struct platform_device *pdev, void *priv);

	void (*suspend)(struct platform_device *pdev, void *priv);

	void (*resume)(struct platform_device *pdev, void *priv);

	void *bsp_priv;

	struct stmmac_axi *axi;

	int has_gmac4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE