clk: qcom: smd: Update MSM8976 RPM clocks.
Subsystems (3)
PATCH 1/1 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.
--- drivers/clk/qcom/clk-smd-rpm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/clk-smd-rpm.c +4 -4
@@ -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,
Signature · 1 line
2.25.1
This patch was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:
Hello:
This patch was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:
Quoted 8 lines · On Tue, 26 Apr 2022 11:02:17 +0200 you wrote:
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.
Signed-off-by Adam Skladowski <[email protected]>--- drivers/clk/qcom/clk-smd-rpm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Here is the summary with links:
- clk: qcom: smd: Update MSM8976 RPM clocks.
https://git.kernel.org/qcom/c/665ca429bc41
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 5 lines · Adam Skladowski
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.
Signed-off-by Adam Skladowski <[email protected]>
This patch should have had a Fixes: tag, not in the least to allow backporting but also to have get_maintainer.pl add the original author in CC for additional review and sign-off.
In any case the omission of the XO clock here is intentional: the clock might be stopped whereas none of the platform is configured to support XO shutdown yet, which is why a "fixed-clock" is used in DT for now.
With that in mind both changes should have been split into separate patches, so that the clock rename can be safely annoted with a Fixes:
tag. Presuming the application of this patch to for-next isn't final, Bjorn is this something we can get worked through? I've validated the rename with my downstream sources, and for that:
But for the XO addition I'm wary of platform lockups.
- Marijn
Quoted 42 lines
--- drivers/clk/qcom/clk-smd-rpm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/clk/qcom/clk-smd-rpm.c +4
-4@@ -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,Signature · 1 line
2.25.1
Bjorn Andersson
AppliedRe: (subset) [PATCH] clk: qcom: smd: Update MSM8976 RPM clocks.
In reply to Adam SkladowskiQuoted 5 lines · Adam Skladowski
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.
Applied, thanks!
[1/1] clk: qcom: smd: Update MSM8976 RPM clocks.
commit: 665ca429bc4131f9165f119ad3ed81c786bf3262
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>