From d5b60ee22ea9cc8fed3e27b717bf93d95304f0c8 Mon Sep 17 00:00:00 2001 From: Srini Kandagatla Date: Mon, 16 May 2016 15:05:00 +0100 Subject: fixup rpm clks on 8996 Change-Id: Ia19aa0ebc209322955da1d22f5eb73c9cd7af908 (cherry picked from commit 6c72267db866b9841312defdf81b100db77a0e71) Git-commit: 6c72267db866b9841312defdf81b100db77a0e71 Git-repo: https://git.linaro.org/landing-teams/working/qualcomm/kernel.git Signed-off-by: Srini Kandagatla Signed-off-by: Taniya Das --- drivers/clk/qcom/clk-smd-rpm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index 2a6f9a6ee232..06eb06009268 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -491,28 +491,28 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8996, rf_clk1_pin, rf_clk1_a_pin, 4); DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8996, rf_clk2_pin, rf_clk2_a_pin, 5); static struct clk_smd_rpm *msm8996_clks[] = { - [RPM_XO_CLK_SRC] = &msm8996_cxo, - [RPM_XO_A_CLK_SRC] = &msm8996_cxo_a, + [RPM_SMD_XO_CLK_SRC] = &msm8996_cxo, + [RPM_SMD_XO_A_CLK_SRC] = &msm8996_cxo_a, [RPM_AGGR1_NOC_CLK] = &msm8996_aggre1_noc_clk, [RPM_AGGR1_NOC_A_CLK] = &msm8996_aggre1_noc_a_clk, [RPM_AGGR2_NOC_CLK] = &msm8996_aggre2_noc_clk, [RPM_AGGR2_NOC_A_CLK] = &msm8996_aggre2_noc_a_clk, - [RPM_PCNOC_CLK] = &msm8996_pcnoc_clk, - [RPM_PCNOC_A_CLK] = &msm8996_pcnoc_a_clk, - [RPM_SNOC_CLK] = &msm8996_snoc_clk, - [RPM_SNOC_A_CLK] = &msm8996_snoc_a_clk, + [RPM_SMD_PCNOC_CLK] = &msm8996_pcnoc_clk, + [RPM_SMD_PCNOC_A_CLK] = &msm8996_pcnoc_a_clk, + [RPM_SMD_SNOC_CLK] = &msm8996_snoc_clk, + [RPM_SMD_SNOC_A_CLK] = &msm8996_snoc_a_clk, [RPM_CNOC_CLK] = &msm8996_cnoc_clk, [RPM_CNOC_A_CLK] = &msm8996_cnoc_a_clk, - [RPM_BIMC_CLK] = &msm8996_bimc_clk, - [RPM_BIMC_A_CLK] = &msm8996_bimc_a_clk, + [RPM_SMD_BIMC_CLK] = &msm8996_bimc_clk, + [RPM_SMD_BIMC_A_CLK] = &msm8996_bimc_a_clk, [RPM_MMAXI_CLK] = &msm8996_mmssnoc_axi_rpm_clk, [RPM_MMAXI_A_CLK] = &msm8996_mmssnoc_axi_rpm_a_clk, [RPM_IPA_CLK] = &msm8996_ipa_clk, [RPM_IPA_A_CLK] = &msm8996_ipa_a_clk, [RPM_CE1_CLK] = &msm8996_ce1_clk, [RPM_CE1_A_CLK] = &msm8996_ce1_a_clk, - [RPM_QDSS_CLK] = &msm8996_qdss_clk, - [RPM_QDSS_A_CLK] = &msm8996_qdss_a_clk, + [RPM_SMD_QDSS_CLK] = &msm8996_qdss_clk, + [RPM_SMD_QDSS_A_CLK] = &msm8996_qdss_a_clk, [RPM_LN_BB_CLK] = &msm8996_ln_bb_clk, [RPM_LN_BB_A_CLK] = &msm8996_ln_bb_a_clk, [RPM_DIV_CLK1] = &msm8996_div_clk1, -- cgit v1.2.3