clk: qcom: lpasscc-sc7280: Skip qdsp6ss clock registration

[ Upstream commit 4fc1c2d9a2b7a394f3b873aae5e03bffd8b5cd31 ]

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: 4ab43d171181 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/qcom/lpasscc-sc7280.c b/drivers/clk/qcom/lpasscc-sc7280.c
index 5c1e17bd0d763d56dcf6cf167051865f352a85fe..8486d7135ab1044737c4444e1c21e1a3121cfdb0 100644 (file)
--- a/drivers/clk/qcom/lpasscc-sc7280.c
+++ b/drivers/clk/qcom/lpasscc-sc7280.c
@@ -118,14 +118,18 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev)
                goto destroy_pm_clk;
        }
 
-       lpass_regmap_config.name = "qdsp6ss";
-       desc = &lpass_qdsp6ss_sc7280_desc;
-
-       ret = qcom_cc_probe_by_index(pdev, 0, desc);
-       if (ret)
-               goto destroy_pm_clk;
+       if (!of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) {
+               lpass_regmap_config.name = "qdsp6ss";
+               lpass_regmap_config.max_register = 0x3f;
+               desc = &lpass_qdsp6ss_sc7280_desc;
+
+               ret = qcom_cc_probe_by_index(pdev, 0, desc);
+               if (ret)
+                       goto destroy_pm_clk;
+       }
 
        lpass_regmap_config.name = "top_cc";
+       lpass_regmap_config.max_register = 0x4;
        desc = &lpass_cc_top_sc7280_desc;
 
        ret = qcom_cc_probe_by_index(pdev, 1, desc);