Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Konrad Dybcio and committed by
Bjorn Andersson
76ca22bd abaf59c4

+12 -4
+12 -4
drivers/clk/qcom/clk-smd-rpm.c
··· 574 574 &clk_smd_rpm_bus_2_snoc_clk, 575 575 }; 576 576 577 + static const struct clk_smd_rpm *qcm2290_icc_clks[] = { 578 + &clk_smd_rpm_bimc_clk, 579 + &clk_smd_rpm_bus_1_cnoc_clk, 580 + &clk_smd_rpm_mmnrt_clk, 581 + &clk_smd_rpm_mmrt_clk, 582 + &clk_smd_rpm_qup_clk, 583 + &clk_smd_rpm_bus_2_snoc_clk, 584 + &clk_smd_rpm_cpuss_gnoc_clk, 585 + }; 586 + 577 587 static struct clk_smd_rpm *msm8909_clks[] = { 578 588 [RPM_SMD_QPIC_CLK] = &clk_smd_rpm_qpic_clk, 579 589 [RPM_SMD_QPIC_CLK_A] = &clk_smd_rpm_qpic_a_clk, ··· 1199 1189 [RPM_SMD_PKA_A_CLK] = &clk_smd_rpm_pka_a_clk, 1200 1190 [RPM_SMD_BIMC_GPU_CLK] = &clk_smd_rpm_bimc_gpu_clk, 1201 1191 [RPM_SMD_BIMC_GPU_A_CLK] = &clk_smd_rpm_bimc_gpu_a_clk, 1202 - [RPM_SMD_CPUSS_GNOC_CLK] = &clk_smd_rpm_cpuss_gnoc_clk, 1203 - [RPM_SMD_CPUSS_GNOC_A_CLK] = &clk_smd_rpm_cpuss_gnoc_a_clk, 1204 1192 }; 1205 1193 1206 1194 static const struct rpm_smd_clk_desc rpm_clk_qcm2290 = { 1207 1195 .clks = qcm2290_clks, 1208 1196 .num_clks = ARRAY_SIZE(qcm2290_clks), 1209 - .icc_clks = sm_qnoc_icc_clks, 1210 - .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks) 1197 + .icc_clks = qcm2290_icc_clks, 1198 + .num_icc_clks = ARRAY_SIZE(qcm2290_icc_clks) 1211 1199 }; 1212 1200 1213 1201 static const struct of_device_id rpm_smd_clk_match_table[] = {