From patchwork Wed Aug 24 18:29:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 9298169 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 97A88607EE for ; Wed, 24 Aug 2016 18:33:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C8A429028 for ; Wed, 24 Aug 2016 18:33:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8105829038; Wed, 24 Aug 2016 18:33:59 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 12B7F29028 for ; Wed, 24 Aug 2016 18:33:59 +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 1bccwc-0003SO-Bt; Wed, 24 Aug 2016 18:30:34 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bccwY-0002Vu-6n for linux-arm-kernel@lists.infradead.org; Wed, 24 Aug 2016 18:30:31 +0000 Received: by mail-pa0-x22b.google.com with SMTP id ti13so8805358pac.0 for ; Wed, 24 Aug 2016 11:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=hvh4cuy6b9hYGeXWwdNB6ttjrNMzpYVH4RRa1JaHIlI=; b=GqkB8aSfpvB0viYSOs9geQcCD7XxY4p30a93ATxtFN4BMFinpoEli60jOK3HB6XYZJ QMHGt7t8nqOQckEZkbvyheoSrHCUsFgnGOAonBGLNSb+gpiAF/79MQhRYEQlLrze6kJR dSB0QG7V922V6gSpqzAboLEzl7w0a7mvRabnI= 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; bh=hvh4cuy6b9hYGeXWwdNB6ttjrNMzpYVH4RRa1JaHIlI=; b=I/Od9h0ciL4Ly+V8+wLDk7yHceerQd5tYZk8t1NY8L6lfcjJ3xNcreqCeKQNiE7SEM W+wfBmE58+J/XZO7o4nxNMmYQgU7lHsT4znGDna8Hph+Bf3x51G7BNqR8UVnm7ZTna2I BWxUMCZmAh5ghp7DLGgW4+FW+CjtiOZ+R8w5WBPY6HX/UJSOOz1UsYZEJgkg9IaBWrQ/ 19DYYwgcCCRE2liNgzSpGgLnYouIMiWtaTWz+2DSgQn0jJ4I45oYNO2p2qNhpYdxVDCU 1YVOOE0/NqD+NJwaXbW/W51wtWY3MbbVL2wTua5hpUgHTUqfwKl4+3FR3nHGZXEC8Hme 4VPg== X-Gm-Message-State: AE9vXwNeRg8C7YWXGTQDSFKVNpvrjgaWDgukgizwWra5isDHNHRG+oC9KeVwX9tgBsFtPocZ X-Received: by 10.66.159.195 with SMTP id xe3mr8296240pab.159.1472063408655; Wed, 24 Aug 2016 11:30:08 -0700 (PDT) Received: from chromelab4.mtv.corp.google.com ([100.98.62.8]) by smtp.gmail.com with ESMTPSA id m65sm15323105pfg.79.2016.08.24.11.30.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 11:30:06 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner Subject: [PATCH] clk: rockchip: mark aclk_emmc_noc as a critical clock on rk3399 Date: Wed, 24 Aug 2016 11:29:39 -0700 Message-Id: <1472063379-717-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160824_113030_318403_D41736F4 X-CRM114-Status: GOOD ( 10.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengxing@rock-chips.com, mturquette@baylibre.com, sboyd@codeaurora.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xing Zheng We don't have code to handle any of the noc clocks in rk3399 and they're all just listed as critical clocks. Let's do the same for aclk_emmc_noc. Without this clock being marked as critical we have problems around suspend/resume after commit 20c389e656a8 ("clk: rockchip: fix incorrect aclk_emmc source gate bits on rk3399"). Before that change we were presumably not actually gating any of these clocks because we were setting the wrong gate. Signed-off-by: Xing Zheng Signed-off-by: Douglas Anderson --- drivers/clk/rockchip/clk-rk3399.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index e445cd64952a..ede6c475b537 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -1489,6 +1489,7 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = { "hclk_perilp1", "hclk_perilp1_noc", "aclk_dmac0_perilp", + "aclk_emmc_noc", "gpll_hclk_perilp1_src", "gpll_aclk_perilp0_src", "gpll_aclk_perihp_src",