From: Jeffrey Hugo Date: Thu, 13 Dec 2018 22:43:40 +0000 (-0700) Subject: clk: qcom: Leave mmss noc on for 8998 X-Git-Tag: v4.20.8~186 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ef2c5838c38cd5cfd799237ce41976e6d19c034a;p=users%2Fdwmw2%2Flinux.git clk: qcom: Leave mmss noc on for 8998 [ Upstream commit 12eced09cd301aa7b1868a67c50a651c2aacd363 ] Similar to other qcom targets, gcc_mmss_noc_cfg_ahb_clk should not be disabled. Any mmss access depends on this clock, and its been observed that enabling mmssnoc_axi_rpm_clk with rpmcc results in an implicit access to mmss and will crash the system if gcc_mmss_noc_cfg_ahb_clk is disabled. Signed-off-by: Jeffrey Hugo Fixes: 4807c71cc688 (arm64: dts: Add msm8998 SoC and MTP board support) Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c index 9f0ae403d5f53..cb714c3e2924e 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2042,6 +2042,12 @@ static struct clk_branch gcc_mmss_noc_cfg_ahb_clk = { .hw.init = &(struct clk_init_data){ .name = "gcc_mmss_noc_cfg_ahb_clk", .ops = &clk_branch2_ops, + /* + * Any access to mmss depends on this clock. + * Gating this clock has been shown to crash the system + * when mmssnoc_axi_rpm_clk is inited in rpmcc. + */ + .flags = CLK_IS_CRITICAL, }, }, };