clk: qcom: smd-rpm: remove duplication between qcs404 and qcm2290 clocks

Reuse qcs404's QPIC and BIMC_GPU clock for qcm2290.

Fixes: 78b727d02815 ("clk: qcom: smd-rpm: Add QCM2290 RPM clock support")
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209164855.128798-5-dmitry.baryshkov@linaro.org

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index ccc5491..31ef634 100644 (file)
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -1168,11 +1168,8 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6375 = {
 DEFINE_CLK_SMD_RPM_XO_BUFFER(qcm2290, ln_bb_clk2, ln_bb_clk2_a, 0x2, 19200000);
 DEFINE_CLK_SMD_RPM_XO_BUFFER(qcm2290, rf_clk3, rf_clk3_a, 6, 38400000);
 
-DEFINE_CLK_SMD_RPM(qcm2290, qpic_clk, qpic_a_clk, QCOM_SMD_RPM_QPIC_CLK, 0);
 DEFINE_CLK_SMD_RPM(qcm2290, cpuss_gnoc_clk, cpuss_gnoc_a_clk,
                   QCOM_SMD_RPM_MEM_CLK, 1);
-DEFINE_CLK_SMD_RPM(qcm2290, bimc_gpu_clk, bimc_gpu_a_clk,
-                  QCOM_SMD_RPM_MEM_CLK, 2);
 
 static struct clk_smd_rpm *qcm2290_clks[] = {
        [RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,
@@ -1203,14 +1200,14 @@ static struct clk_smd_rpm *qcm2290_clks[] = {
        [RPM_SMD_SNOC_LPASS_A_CLK] = &sm6125_snoc_lpass_a_clk,
        [RPM_SMD_CE1_CLK] = &msm8992_ce1_clk,
        [RPM_SMD_CE1_A_CLK] = &msm8992_ce1_a_clk,
-       [RPM_SMD_QPIC_CLK] = &qcm2290_qpic_clk,
-       [RPM_SMD_QPIC_CLK_A] = &qcm2290_qpic_a_clk,
+       [RPM_SMD_QPIC_CLK] = &qcs404_qpic_clk,
+       [RPM_SMD_QPIC_CLK_A] = &qcs404_qpic_a_clk,
        [RPM_SMD_HWKM_CLK] = &qcm2290_hwkm_clk,
        [RPM_SMD_HWKM_A_CLK] = &qcm2290_hwkm_a_clk,
        [RPM_SMD_PKA_CLK] = &qcm2290_pka_clk,
        [RPM_SMD_PKA_A_CLK] = &qcm2290_pka_a_clk,
-       [RPM_SMD_BIMC_GPU_CLK] = &qcm2290_bimc_gpu_clk,
-       [RPM_SMD_BIMC_GPU_A_CLK] = &qcm2290_bimc_gpu_a_clk,
+       [RPM_SMD_BIMC_GPU_CLK] = &qcs404_bimc_gpu_clk,
+       [RPM_SMD_BIMC_GPU_A_CLK] = &qcs404_bimc_gpu_a_clk,
        [RPM_SMD_CPUSS_GNOC_CLK] = &qcm2290_cpuss_gnoc_clk,
        [RPM_SMD_CPUSS_GNOC_A_CLK] = &qcm2290_cpuss_gnoc_a_clk,
 };