From patchwork Wed Aug 31 06:13:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 9306335 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00F5E601C0 for ; Wed, 31 Aug 2016 06:14:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBE7028E32 for ; Wed, 31 Aug 2016 06:14:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0A8028E36; Wed, 31 Aug 2016 06:14:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C12E228E32 for ; Wed, 31 Aug 2016 06:14:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1beynC-0000a5-B9; Wed, 31 Aug 2016 06:14:34 +0000 Received: from mail-pa0-f65.google.com ([209.85.220.65]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beymv-0000PQ-2k for linux-rockchip@lists.infradead.org; Wed, 31 Aug 2016 06:14:17 +0000 Received: by mail-pa0-f65.google.com with SMTP id hh10so2111935pac.1 for ; Tue, 30 Aug 2016 23:13:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xaEif7qzO2FPla2+57fsNLNqMLaVpw3xNSQVOvRxaTM=; b=m2h79KDp/x8aNtent3CxvfFrsGDSU18eRbBrRxfFMSU3Axd3pLjqqJH8cJiRaXFSMC d+pGWGqbC6nKgKk0lYtDYE7zV7gPrRs2H5hzHAHlSTUdEL1bWp7gWhm+I1tWWb8SKi// BEoq5ygZSWj3VG6HAQOBCwDMkYKmYLx0yT9+AHU0E/vEJo1TDXbJbvT+tDrAWNBO0F4F N/yINRXh0qru/Eoh2nQKA5HPJDBLyZT9qDRU01T0VTNvj8j8x5SeAaT7hUDdixmpfJDH TFCS+v8ZNjesvFinip9KrfjLfmYhDcydjmGxBegA+SNRhc5LUjs+/KIAYi+pDKLOJMLo Ic4A== X-Gm-Message-State: AE9vXwO4i4mvivHY6KTxNy13y7Vd04ugVgitLAch7xL2dVHXm+8r+cEsuukLe9VqMMuExg== X-Received: by 10.66.189.104 with SMTP id gh8mr13661516pac.125.1472624036082; Tue, 30 Aug 2016 23:13:56 -0700 (PDT) Received: from localhost.localdomain (50-196-170-193-static.hfc.comcastbusiness.net. [50.196.170.193]) by smtp.gmail.com with ESMTPSA id n80sm61618441pfi.19.2016.08.30.23.13.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Aug 2016 23:13:55 -0700 (PDT) From: Caesar Wang To: Heiko Stuebner , netdev@vger.kernel.org Subject: [RESEND PATCH 1/4] net: stmmac: dwmac-rk: fixes the gmac resume after PD on/off Date: Wed, 31 Aug 2016 14:13:45 +0800 Message-Id: <1472624028-7082-2-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472624028-7082-1-git-send-email-wxt@rock-chips.com> References: <1472624028-7082-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160830_231417_220097_D0D21B1E X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brian Norris , Alexandre Torgue , dbasehore@chromium.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Roger Chen , Giuseppe Cavallaro , Caesar Wang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 9210591..289e7a6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -629,6 +629,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"); @@ -641,15 +651,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;