From patchwork Tue Aug 9 18:02:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zhong X-Patchwork-Id: 9271987 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 AD4276082E for ; Tue, 9 Aug 2016 18:04:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A41F226253 for ; Tue, 9 Aug 2016 18:04:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98D6927E71; Tue, 9 Aug 2016 18:04:52 +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 2F33826253 for ; Tue, 9 Aug 2016 18:04:52 +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 1bXBMs-00027G-OZ; Tue, 09 Aug 2016 18:03:10 +0000 Received: from mail-pa0-f66.google.com ([209.85.220.66]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXBMl-00023B-QR; Tue, 09 Aug 2016 18:03:05 +0000 Received: by mail-pa0-f66.google.com with SMTP id vy10so1294445pac.0; Tue, 09 Aug 2016 11:02:43 -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; bh=TOeEsDhCZB8VmWIN6J+5SzqWEW//+o4829VFRUAgEqk=; b=VdSTEY8TLVOPSU6L/qIyu2kBM3WVCUgD5fyaNRApPef6w9cZa10Ri9jApxmU/kYRBr bc556TpLj/D9p+yTD6BDIQ8ntoH8TBUjegQBK/Y1dXLDDvLu432qNxknKywIthOJUw+L E8Y+S8iipDH+JZ9/rVrA8H3y+y5DX+DzTLcXSrixE6AXatKn3ar+mrcum/uezlGzSc1i GpnGmXb0vfQk9PPb8Mf3EwwHiqYFAoKGLvJzdotiXvkmrE6954E05Ba5LZB2wYgXFCtm 9NSjL+byqZj1HKUo21vWp3JLdQRMAXVY10TxPAsik0Aeb+BSt0AN5z3JYyuhTG/gfnRo RqOg== X-Gm-Message-State: AEkoouuGtBb68Ow+yyLtjLrUU+RJWdDk85JddUDlVTzIFAHdttcGhEbRGuo69bLjRAjd5Q== X-Received: by 10.66.49.137 with SMTP id u9mr73621228pan.72.1470765762548; Tue, 09 Aug 2016 11:02:42 -0700 (PDT) Received: from lab2000-1.corp.google.com ([172.22.52.48]) by smtp.gmail.com with ESMTPSA id c82sm57558175pfb.72.2016.08.09.11.02.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 11:02:40 -0700 (PDT) From: Chris Zhong To: heiko@sntech.de, zhengxing@rock-chips.com Subject: [v2 PATCH] clk: rockchip: mark rk3399 hdcp_noc and vio_noc as critical Date: Tue, 9 Aug 2016 11:02:33 -0700 Message-Id: <1470765753-11619-1-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160809_110303_880303_3857BF2C X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. 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: dianders@chromium.org, yzq@rock-chips.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, Chris Zhong , tfiga@chromium.org, linux-rockchip@lists.infradead.org, wulf@rock-chips.com, groeck@chromium.org, marcheu@chromium.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 Fix incorrect rk3399 aclk_vio gating bit, it should be 0, not 10. With this modification, the aclk_vio_noc should be put into critical list, since it is required by VOP. And the Type-C DP need these clocks: aclk_hdcp_noc, hclk_hdcp_noc, pclk_hdcp_noc. Mark them as critical to avoid someone close them. Signed-off-by: Chris Zhong Reviewed-by: Guenter Roeck Reviewed-by: Xing Zheng --- drivers/clk/rockchip/clk-rk3399.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index b173711a..676b017 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -1073,7 +1073,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { /* vio */ COMPOSITE(ACLK_VIO, "aclk_vio", mux_pll_src_cpll_gpll_ppll_p, CLK_IGNORE_UNUSED, RK3399_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5, DFLAGS, - RK3399_CLKGATE_CON(11), 10, GFLAGS), + RK3399_CLKGATE_CON(11), 0, GFLAGS), COMPOSITE_NOMUX(PCLK_VIO, "pclk_vio", "aclk_vio", 0, RK3399_CLKSEL_CON(43), 0, 5, DFLAGS, RK3399_CLKGATE_CON(11), 1, GFLAGS), @@ -1470,6 +1470,9 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = { "aclk_cci_pre", "aclk_gic", "aclk_gic_noc", + "aclk_hdcp_noc", + "hclk_hdcp_noc", + "pclk_hdcp_noc", "pclk_perilp0", "pclk_perilp0", "hclk_perilp0", @@ -1489,6 +1492,7 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = { "gpll_hclk_perilp1_src", "gpll_aclk_perilp0_src", "gpll_aclk_perihp_src", + "aclk_vio_noc", }; static const char *const rk3399_pmucru_critical_clocks[] __initconst = {