clk: qcom: smd: Update MSM8976 RPM clocks.

MSM8976 does not have rpm clock named mmssnoc,
instead it's called sysmmnoc, drop define and reuse.
While we are at it add XO clock to list.

Fixes: 7d61e773c3ed ("clk: qcom: smd: Add support for MSM8976 rpm clocks")
Signed-off-by: Adam Skladowski <a39.skl@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220426090226.27293-1-a39.skl@gmail.com

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index afc6dc9..10b4e6d 100644 (file)
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -563,17 +563,19 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8974 = {
        .num_clks = ARRAY_SIZE(msm8974_clks),
 };
 
-DEFINE_CLK_SMD_RPM(msm8976, mmssnoc_ahb_clk, mmssnoc_ahb_a_clk,
-                  QCOM_SMD_RPM_BUS_CLK, 2);
 DEFINE_CLK_SMD_RPM(msm8976, ipa_clk, ipa_a_clk, QCOM_SMD_RPM_IPA_CLK, 0);
 
 static struct clk_smd_rpm *msm8976_clks[] = {
+       [RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,
+       [RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,
        [RPM_SMD_PCNOC_CLK] = &msm8916_pcnoc_clk,
        [RPM_SMD_PCNOC_A_CLK] = &msm8916_pcnoc_a_clk,
        [RPM_SMD_SNOC_CLK] = &msm8916_snoc_clk,
        [RPM_SMD_SNOC_A_CLK] = &msm8916_snoc_a_clk,
        [RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,
        [RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,
+       [RPM_SMD_SYSMMNOC_CLK]  = &msm8936_sysmmnoc_clk,
+       [RPM_SMD_SYSMMNOC_A_CLK] = &msm8936_sysmmnoc_a_clk,
        [RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,
        [RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,
        [RPM_SMD_BB_CLK1] = &msm8916_bb_clk1,
@@ -586,8 +588,6 @@ static struct clk_smd_rpm *msm8976_clks[] = {
        [RPM_SMD_BB_CLK1_A_PIN] = &msm8916_bb_clk1_a_pin,
        [RPM_SMD_BB_CLK2_PIN] = &msm8916_bb_clk2_pin,
        [RPM_SMD_BB_CLK2_A_PIN] = &msm8916_bb_clk2_a_pin,
-       [RPM_SMD_MMSSNOC_AHB_CLK] = &msm8976_mmssnoc_ahb_clk,
-       [RPM_SMD_MMSSNOC_AHB_A_CLK] = &msm8976_mmssnoc_ahb_a_clk,
        [RPM_SMD_DIV_CLK2] = &msm8974_div_clk2,
        [RPM_SMD_DIV_A_CLK2] = &msm8974_div_a_clk2,
        [RPM_SMD_IPA_CLK] = &msm8976_ipa_clk,