From patchwork Thu Sep 1 17:50:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 9309503 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 853B060760 for ; Thu, 1 Sep 2016 17:51:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F5DD2949A for ; Thu, 1 Sep 2016 17:51:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5215F294E6; Thu, 1 Sep 2016 17:51:10 +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 B00882949A for ; Thu, 1 Sep 2016 17:51:09 +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 1bfW8r-0005RO-9Z; Thu, 01 Sep 2016 17:51:09 +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 1bfW8I-0005G5-4z for linux-rockchip@lists.infradead.org; Thu, 01 Sep 2016 17:50:35 +0000 Received: by mail-pa0-f65.google.com with SMTP id hh10so4463963pac.1 for ; Thu, 01 Sep 2016 10:50:12 -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=09V76e/N4U/PbX20tppetS9LFnjZkJFBuqiIs1iWy6o=; b=hf4WhL6Y61JEVCgVivtZpS/lF8oIa6PcobH2ngvDOS7IDyCj7CzVdJRapYVAqyE7Cw /XahVHF55heFV772g1BDIGiJADzlm9rAtiilIbu6DtaP6yyCHMQHnhn0b54xqcmWck3F y7CwR1sSwNg4yOEkm33H1AZg0Gd1IECCXKEbyX1HNxz6lCNp5voTmwLqoK9JJ0TKLUGQ KurqenPbzx88IdnxUzChNkhX/r9225Vwgt9nCsgkQssOGOnW0Gacog+sd0deGp9eSdXp ZPPGTVJQFdhLRIaI0EL7SnB7GmpHmnlT6oUt8VzJYkix3IdTJykaGOrOeBO+8nQcGThO rPrA== X-Gm-Message-State: AE9vXwPT1Rnj5lnBTJ+UpUSXnMWvKdl4sL5XsvBHidyoA7fD8T/OrNIzgYyx/E1xPOaE2Q== X-Received: by 10.66.90.74 with SMTP id bu10mr28491351pab.33.1472752212407; Thu, 01 Sep 2016 10:50:12 -0700 (PDT) Received: from nb.corp.google.com ([172.22.52.177]) by smtp.gmail.com with ESMTPSA id d72sm9207436pfj.15.2016.09.01.10.50.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Sep 2016 10:50:11 -0700 (PDT) From: Caesar Wang To: Heiko Stuebner , "David S. Miller" 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160901_105034_325303_D30F0ACB X-CRM114-Status: UNSURE ( 9.58 ) 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 , netdev@vger.kernel.org, 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 --- 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;