net: stmmac: dwmac-rk: fix for GMAC resume after PD off/on

GMAC Power Domain(PD) will be disabled during suspend.
That will causes GRF registers reset.
So corresponding GRF registers for GMAC must be setup again.

Change-Id: I9ca541c4599299bad309b810994824d364c2a510
Signed-off-by: Roger Chen <roger.chen@rock-chips.com>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 4ce2ef1e5d499d39f44619c71d43e185455d1696..4957618c3b80a6ef003b0f2ad91ece77dab7aa42 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -852,6 +852,17 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,
                                                        "rockchip,grf");
        bsp_priv->pdev = pdev;
 
+       gmac_clk_init(bsp_priv);
+
+       return bsp_priv;
+}
+
+static int rk_gmac_init(struct platform_device *pdev, void *priv)
+{
+       struct rk_priv_data *bsp_priv = priv;
+       int ret;
+       struct device *dev = &pdev->dev;
+
        /*rmii or rgmii*/
        if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) {
                dev_info(dev, "init for RGMII\n");
@@ -864,16 +875,6 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,
                dev_err(dev, "NO interface defined!\n");
        }
 
-       gmac_clk_init(bsp_priv);
-
-       return bsp_priv;
-}
-
-static int rk_gmac_init(struct platform_device *pdev, void *priv)
-{
-       struct rk_priv_data *bsp_priv = priv;
-       int ret;
-
        ret = phy_power_on(bsp_priv, true);
        if (ret)
                return ret;