From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754117AbcIAVu2 (ORCPT ); Thu, 1 Sep 2016 17:50:28 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34191 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112AbcIAVu0 (ORCPT ); Thu, 1 Sep 2016 17:50:26 -0400 From: Caesar Wang To: Heiko Stuebner , "David S. Miller" Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, Brian Norris , Douglas Anderson , dbasehore@chromium.org, Roger Chen , Caesar Wang , Giuseppe Cavallaro , Alexandre Torgue , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/6] net: stmmac: dwmac-rk: fixes the gmac resume after PD on/off Date: Fri, 2 Sep 2016 01:50:00 +0800 Message-Id: <1472752204-8924-3-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472752204-8924-1-git-send-email-wxt@rock-chips.com> References: <1472752204-8924-1-git-send-email-wxt@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roger Chen 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. Signed-off-by: Roger Chen Signed-off-by: Caesar Wang --- Changes in v4: None Changes in v3: None Changes in v2: - rk_gmac_powerup instead of the rk_gmac_init. drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 4e6a270..e2ba6c4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -853,6 +853,16 @@ 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_powerup(struct rk_priv_data *bsp_priv) +{ + int ret; + struct device *dev = &bsp_priv->pdev->dev; + /*rmii or rgmii*/ if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) { dev_info(dev, "init for RGMII\n"); @@ -865,15 +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_powerup(struct rk_priv_data *bsp_priv) -{ - int ret; - ret = phy_power_on(bsp_priv, true); if (ret) return ret; -- 1.9.1