| Message ID | 20221203175808.859067-2-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | clk: qcom: smd-rpm: drop platform names | expand |
On 03/12/2022 18:57, Dmitry Baryshkov wrote: > Reuse sm6125's MMAXI clocks for sm6375. Also drop QCOM_SMD_RPM_MMXI_CLK, > which is equal to QCOM_SMD_RPM_MMAXI_CLK. > > Fixes: 644c42295592 ("clk: qcom: smd: Add SM6375 clocks") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Nice catch! Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/clk/qcom/clk-smd-rpm.c | 10 ++++------ > include/linux/soc/qcom/smd-rpm.h | 1 - > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c > index fea505876855..077875cf0d80 100644 > --- a/drivers/clk/qcom/clk-smd-rpm.c > +++ b/drivers/clk/qcom/clk-smd-rpm.c > @@ -1120,8 +1120,6 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6115 = { > }; > > /* SM6375 */ > -DEFINE_CLK_SMD_RPM(sm6375, mmnrt_clk, mmnrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 0); > -DEFINE_CLK_SMD_RPM(sm6375, mmrt_clk, mmrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 1); > DEFINE_CLK_SMD_RPM(qcm2290, hwkm_clk, hwkm_a_clk, QCOM_SMD_RPM_HWKM_CLK, 0); > DEFINE_CLK_SMD_RPM(qcm2290, pka_clk, pka_a_clk, QCOM_SMD_RPM_PKA_CLK, 0); > DEFINE_CLK_SMD_RPM_BRANCH(sm6375, bimc_freq_log, bimc_freq_log_a, QCOM_SMD_RPM_MISC_CLK, 4, 1); > @@ -1140,10 +1138,10 @@ static struct clk_smd_rpm *sm6375_clks[] = { > [RPM_SMD_IPA_A_CLK] = &msm8976_ipa_a_clk, > [RPM_SMD_QUP_CLK] = &sm6125_qup_clk, > [RPM_SMD_QUP_A_CLK] = &sm6125_qup_a_clk, > - [RPM_SMD_MMRT_CLK] = &sm6375_mmrt_clk, > - [RPM_SMD_MMRT_A_CLK] = &sm6375_mmrt_a_clk, > - [RPM_SMD_MMNRT_CLK] = &sm6375_mmnrt_clk, > - [RPM_SMD_MMNRT_A_CLK] = &sm6375_mmnrt_a_clk, > + [RPM_SMD_MMRT_CLK] = &sm6125_mmrt_clk, > + [RPM_SMD_MMRT_A_CLK] = &sm6125_mmrt_a_clk, > + [RPM_SMD_MMNRT_CLK] = &sm6125_mmnrt_clk, > + [RPM_SMD_MMNRT_A_CLK] = &sm6125_mmnrt_a_clk, > [RPM_SMD_SNOC_PERIPH_CLK] = &sm6125_snoc_periph_clk, > [RPM_SMD_SNOC_PERIPH_A_CLK] = &sm6125_snoc_periph_a_clk, > [RPM_SMD_SNOC_LPASS_CLK] = &sm6125_snoc_lpass_clk, > diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h > index 3ab8c07f71c0..82c9d489833a 100644 > --- a/include/linux/soc/qcom/smd-rpm.h > +++ b/include/linux/soc/qcom/smd-rpm.h > @@ -41,7 +41,6 @@ struct qcom_smd_rpm; > #define QCOM_SMD_RPM_HWKM_CLK 0x6d6b7768 > #define QCOM_SMD_RPM_PKA_CLK 0x616b70 > #define QCOM_SMD_RPM_MCFG_CLK 0x6766636d > -#define QCOM_SMD_RPM_MMXI_CLK 0x69786d6d > > int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm, > int state,
On 12/3/22 11:57 AM, Dmitry Baryshkov wrote: > Reuse sm6125's MMAXI clocks for sm6375. Also drop QCOM_SMD_RPM_MMXI_CLK, > which is equal to QCOM_SMD_RPM_MMAXI_CLK. > > Fixes: 644c42295592 ("clk: qcom: smd: Add SM6375 clocks") Was there an actual bug in the above commit? I only ask because the "Fixes" thing to me implies that this patch is a bug fix to be back-ported, and I don't think that's the case here. Perhaps the MMXI/MMAXI duplication could be considered a bug, but if that's the case please fix that separately (first), and then reuse the same clock for both SoCs second. Otherwise this looks good to me. Reviewed-by: Alex Elder <elder@linaro.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/clk/qcom/clk-smd-rpm.c | 10 ++++------ > include/linux/soc/qcom/smd-rpm.h | 1 - > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c > index fea505876855..077875cf0d80 100644 > --- a/drivers/clk/qcom/clk-smd-rpm.c > +++ b/drivers/clk/qcom/clk-smd-rpm.c > @@ -1120,8 +1120,6 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6115 = { > }; > > /* SM6375 */ > -DEFINE_CLK_SMD_RPM(sm6375, mmnrt_clk, mmnrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 0); > -DEFINE_CLK_SMD_RPM(sm6375, mmrt_clk, mmrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 1); > DEFINE_CLK_SMD_RPM(qcm2290, hwkm_clk, hwkm_a_clk, QCOM_SMD_RPM_HWKM_CLK, 0); > DEFINE_CLK_SMD_RPM(qcm2290, pka_clk, pka_a_clk, QCOM_SMD_RPM_PKA_CLK, 0); > DEFINE_CLK_SMD_RPM_BRANCH(sm6375, bimc_freq_log, bimc_freq_log_a, QCOM_SMD_RPM_MISC_CLK, 4, 1); > @@ -1140,10 +1138,10 @@ static struct clk_smd_rpm *sm6375_clks[] = { > [RPM_SMD_IPA_A_CLK] = &msm8976_ipa_a_clk, > [RPM_SMD_QUP_CLK] = &sm6125_qup_clk, > [RPM_SMD_QUP_A_CLK] = &sm6125_qup_a_clk, > - [RPM_SMD_MMRT_CLK] = &sm6375_mmrt_clk, > - [RPM_SMD_MMRT_A_CLK] = &sm6375_mmrt_a_clk, > - [RPM_SMD_MMNRT_CLK] = &sm6375_mmnrt_clk, > - [RPM_SMD_MMNRT_A_CLK] = &sm6375_mmnrt_a_clk, > + [RPM_SMD_MMRT_CLK] = &sm6125_mmrt_clk, > + [RPM_SMD_MMRT_A_CLK] = &sm6125_mmrt_a_clk, > + [RPM_SMD_MMNRT_CLK] = &sm6125_mmnrt_clk, > + [RPM_SMD_MMNRT_A_CLK] = &sm6125_mmnrt_a_clk, > [RPM_SMD_SNOC_PERIPH_CLK] = &sm6125_snoc_periph_clk, > [RPM_SMD_SNOC_PERIPH_A_CLK] = &sm6125_snoc_periph_a_clk, > [RPM_SMD_SNOC_LPASS_CLK] = &sm6125_snoc_lpass_clk, > diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h > index 3ab8c07f71c0..82c9d489833a 100644 > --- a/include/linux/soc/qcom/smd-rpm.h > +++ b/include/linux/soc/qcom/smd-rpm.h > @@ -41,7 +41,6 @@ struct qcom_smd_rpm; > #define QCOM_SMD_RPM_HWKM_CLK 0x6d6b7768 > #define QCOM_SMD_RPM_PKA_CLK 0x616b70 > #define QCOM_SMD_RPM_MCFG_CLK 0x6766636d > -#define QCOM_SMD_RPM_MMXI_CLK 0x69786d6d > > int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm, > int state,
diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index fea505876855..077875cf0d80 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -1120,8 +1120,6 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6115 = { }; /* SM6375 */ -DEFINE_CLK_SMD_RPM(sm6375, mmnrt_clk, mmnrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 0); -DEFINE_CLK_SMD_RPM(sm6375, mmrt_clk, mmrt_a_clk, QCOM_SMD_RPM_MMXI_CLK, 1); DEFINE_CLK_SMD_RPM(qcm2290, hwkm_clk, hwkm_a_clk, QCOM_SMD_RPM_HWKM_CLK, 0); DEFINE_CLK_SMD_RPM(qcm2290, pka_clk, pka_a_clk, QCOM_SMD_RPM_PKA_CLK, 0); DEFINE_CLK_SMD_RPM_BRANCH(sm6375, bimc_freq_log, bimc_freq_log_a, QCOM_SMD_RPM_MISC_CLK, 4, 1); @@ -1140,10 +1138,10 @@ static struct clk_smd_rpm *sm6375_clks[] = { [RPM_SMD_IPA_A_CLK] = &msm8976_ipa_a_clk, [RPM_SMD_QUP_CLK] = &sm6125_qup_clk, [RPM_SMD_QUP_A_CLK] = &sm6125_qup_a_clk, - [RPM_SMD_MMRT_CLK] = &sm6375_mmrt_clk, - [RPM_SMD_MMRT_A_CLK] = &sm6375_mmrt_a_clk, - [RPM_SMD_MMNRT_CLK] = &sm6375_mmnrt_clk, - [RPM_SMD_MMNRT_A_CLK] = &sm6375_mmnrt_a_clk, + [RPM_SMD_MMRT_CLK] = &sm6125_mmrt_clk, + [RPM_SMD_MMRT_A_CLK] = &sm6125_mmrt_a_clk, + [RPM_SMD_MMNRT_CLK] = &sm6125_mmnrt_clk, + [RPM_SMD_MMNRT_A_CLK] = &sm6125_mmnrt_a_clk, [RPM_SMD_SNOC_PERIPH_CLK] = &sm6125_snoc_periph_clk, [RPM_SMD_SNOC_PERIPH_A_CLK] = &sm6125_snoc_periph_a_clk, [RPM_SMD_SNOC_LPASS_CLK] = &sm6125_snoc_lpass_clk, diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h index 3ab8c07f71c0..82c9d489833a 100644 --- a/include/linux/soc/qcom/smd-rpm.h +++ b/include/linux/soc/qcom/smd-rpm.h @@ -41,7 +41,6 @@ struct qcom_smd_rpm; #define QCOM_SMD_RPM_HWKM_CLK 0x6d6b7768 #define QCOM_SMD_RPM_PKA_CLK 0x616b70 #define QCOM_SMD_RPM_MCFG_CLK 0x6766636d -#define QCOM_SMD_RPM_MMXI_CLK 0x69786d6d int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm, int state,
Reuse sm6125's MMAXI clocks for sm6375. Also drop QCOM_SMD_RPM_MMXI_CLK, which is equal to QCOM_SMD_RPM_MMAXI_CLK. Fixes: 644c42295592 ("clk: qcom: smd: Add SM6375 clocks") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/clk/qcom/clk-smd-rpm.c | 10 ++++------ include/linux/soc/qcom/smd-rpm.h | 1 - 2 files changed, 4 insertions(+), 7 deletions(-)