clk: qcom: smd-rpm: Move CPUSS_GNoC clock to interconnect

As it turns out, it's yet another interconnect bus clock. Move it
there. See [1] for reference.

[1] https://android.googlesource.com/kernel/msm-extra/devicetree/+/02f8c342b23c20a5cf967df649814be37a08227c%5E%21/#F0

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230726-topic-icc_coeff-v4-10-c04b60caa467@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index 0191fc0dd7dac1f87a9c44fcb6b9e59850aee57a..8602c02047d0481b28e7c7da75ddb1564aa3da14 100644 (file)
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -574,6 +574,16 @@ static const struct clk_smd_rpm *sm_qnoc_icc_clks[] = {
        &clk_smd_rpm_bus_2_snoc_clk,
 };
 
+static const struct clk_smd_rpm *qcm2290_icc_clks[] = {
+       &clk_smd_rpm_bimc_clk,
+       &clk_smd_rpm_bus_1_cnoc_clk,
+       &clk_smd_rpm_mmnrt_clk,
+       &clk_smd_rpm_mmrt_clk,
+       &clk_smd_rpm_qup_clk,
+       &clk_smd_rpm_bus_2_snoc_clk,
+       &clk_smd_rpm_cpuss_gnoc_clk,
+};
+
 static struct clk_smd_rpm *msm8909_clks[] = {
        [RPM_SMD_QPIC_CLK]              = &clk_smd_rpm_qpic_clk,
        [RPM_SMD_QPIC_CLK_A]            = &clk_smd_rpm_qpic_a_clk,
@@ -1189,15 +1199,13 @@ static struct clk_smd_rpm *qcm2290_clks[] = {
        [RPM_SMD_PKA_A_CLK] = &clk_smd_rpm_pka_a_clk,
        [RPM_SMD_BIMC_GPU_CLK] = &clk_smd_rpm_bimc_gpu_clk,
        [RPM_SMD_BIMC_GPU_A_CLK] = &clk_smd_rpm_bimc_gpu_a_clk,
-       [RPM_SMD_CPUSS_GNOC_CLK] = &clk_smd_rpm_cpuss_gnoc_clk,
-       [RPM_SMD_CPUSS_GNOC_A_CLK] = &clk_smd_rpm_cpuss_gnoc_a_clk,
 };
 
 static const struct rpm_smd_clk_desc rpm_clk_qcm2290 = {
        .clks = qcm2290_clks,
        .num_clks = ARRAY_SIZE(qcm2290_clks),
-       .icc_clks = sm_qnoc_icc_clks,
-       .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks)
+       .icc_clks = qcm2290_icc_clks,
+       .num_icc_clks = ARRAY_SIZE(qcm2290_icc_clks)
 };
 
 static const struct of_device_id rpm_smd_clk_match_table[] = {