Skip to content

Commit 4fc1c2d

Browse files
Srinivasa Rao Mandadapuandersson
authored andcommitted
clk: qcom: lpasscc-sc7280: Skip qdsp6ss clock registration
The qdsp6ss memory region is being shared by ADSP remoteproc device and lpasscc clock device, hence causing memory conflict. To avoid this, when qdsp6ss clocks are being enabled in remoteproc driver, skip qdsp6ss clock registration if "qcom,adsp-pil-mode" is enabled and also assign max_register value. Fixes: 4ab43d1 ("clk: qcom: Add lpass clock controller driver for SC7280") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230407092255.119690-3-quic_mohs@quicinc.com
1 parent 5c3a7dc commit 4fc1c2d

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/clk/qcom/lpasscc-sc7280.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,18 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev)
121121
goto destroy_pm_clk;
122122
}
123123

124-
lpass_regmap_config.name = "qdsp6ss";
125-
desc = &lpass_qdsp6ss_sc7280_desc;
126-
127-
ret = qcom_cc_probe_by_index(pdev, 0, desc);
128-
if (ret)
129-
goto destroy_pm_clk;
124+
if (!of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) {
125+
lpass_regmap_config.name = "qdsp6ss";
126+
lpass_regmap_config.max_register = 0x3f;
127+
desc = &lpass_qdsp6ss_sc7280_desc;
128+
129+
ret = qcom_cc_probe_by_index(pdev, 0, desc);
130+
if (ret)
131+
goto destroy_pm_clk;
132+
}
130133

131134
lpass_regmap_config.name = "top_cc";
135+
lpass_regmap_config.max_register = 0x4;
132136
desc = &lpass_cc_top_sc7280_desc;
133137

134138
ret = qcom_cc_probe_by_index(pdev, 1, desc);

0 commit comments

Comments
 (0)