clk: qcom: remove superfluous alpha settings from PLL configs
Subsystems (3)
v2 cover clk: qcom: remove superfluous alpha settings from PLL configs
There are several alpha PLL configurations, where the alpha mode is enabled even if it is not strictly required in order to get the desired output rate of the PLL. This small series removes those superfluous settings.
---
Changes in v2:
- extend the commit messages in the patches to indicate that dropping 'alpha_en_mask' is safe
- collect RB tags
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Gabor Juhos (5):
clk: qcom: apss-ipq-pll: drop 'alpha_en_mask' from IPQ5018 PLL config
clk: qcom: apps-ipq-pll: drop 'alpha_en_mask' from IPQ5332 PLL config
clk: qcom: gcc-ipq6018: remove alpha values from NSS Crypto PLL's config
clk: qcom: dispcc-qcm2290: remove alpha values from disp_cc_pll0_config
clk: qcom: dispcc-sm6115: remove alpha values from disp_cc_pll0_config
drivers/clk/qcom/apss-ipq-pll.c | 3 +-- drivers/clk/qcom/dispcc-qcm2290.c | 2 -- drivers/clk/qcom/dispcc-sm6115.c | 2 -- drivers/clk/qcom/gcc-ipq6018.c | 4 +--- 4 files changed, 2 insertions(+), 9 deletions(-)
---
base-commit: 9852d85ec9d492ebef56dc5f229416c925758edc
change-id: 20241021-alpha-mode-cleanup-661b544644d7
Best regards,
Signature · 1 line
Gabor Juhos <[email protected]>
PATCH v2 1/5 clk: qcom: apss-ipq-pll: drop 'alpha_en_mask' from IPQ5018 PLL config
Since neither 'alpha' nor 'alpha_hi' is defined in the configuration, those will be initialized with zero values implicitly. By using zero alpha values, the output rate of the PLL will be the same whether alpha mode is enabled or not.
Remove the superfluous initialization of the 'alpha_en_mask' member to make it clear that enabling alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the set_rate() op might require that it is enabled already. In this particular case however, the clk_alpha_pll_stromer_set_rate() function will get reset the ALPHA_EN bit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.
No functional changes, the initial rate of the PLL is the same both before and after the patch.
Tested on TP-Link Archer AX55 v1 (IPQ5018).
---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/apss-ipq-pll.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +0 -1
@@ -73,7 +73,6 @@ static const struct alpha_pll_config ipq5018_pll_config = { .main_output_mask = BIT(0), .aux_output_mask = BIT(1), .early_output_mask = BIT(3), - .alpha_en_mask = BIT(24), .status_val = 0x3, .status_mask = GENMASK(10, 8), .lock_det = BIT(2),
Signature · 1 line
2.47.0
Re: [PATCH v2 1/5] clk: qcom: apss-ipq-pll: drop 'alpha_en_mask' from IPQ5018 PLL config
Quoted 21 lines · Gabor Juhos
Since neither 'alpha' nor '
alpha_hi' is defined in the configuration, those will be initialized with zero values implicitly. By using zero alpha values, the output rate of the PLL will be the same whether alpha mode is enabled or not.Remove the superfluous initialization of the '
alpha_en_mask' member to make it clear that enabling alpha mode is not required to get the desired output rate.Despite that enabling alpha mode is not needed for the initial configuration, the
set_rate()op might require that it is enabled already. In this particular case however, theclk_alpha_pll_stromer_set_rate()function will get reset theALPHA_ENbit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.No functional changes, the initial rate of the PLL is the same both before and after the patch.
Tested on TP-Link Archer AX55 v1 (IPQ5018).
Quoted 9 lines
Signed-off-by Gabor Juhos <[email protected]>---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- Link to v1: https://lore.kernel.org/r/[email protected]--- drivers/clk/qcom/apss-ipq-pll.c | 1 - 1 file changed, 1 deletion(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v2 2/5 clk: qcom: apps-ipq-pll: drop 'alpha_en_mask' from IPQ5332 PLL config
In reply to Gabor JuhosSince neither 'alpha' nor 'alpha_hi' is defined in the configuration, those will be initialized with zero values implicitly. By using zero alpha values, the output rate of the PLL will be the same whether alpha mode is enabled or not.
Remove the superfluous initialization of the 'alpha_en_mask' member to make it clear that enabling alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the set_rate() op might require that it is enabled already. In this particular case however, the clk_alpha_pll_stromer_plus_set_rate() function will get reset the ALPHA_EN bit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.
While at it, also add a comment to indicate the frequency the PLL runs at with the current configuration.
No functional changes, the initial rate of the PLL is the same both before and after the patch.
Tested on Xiaomi Router BE3600 2.5G (IPQ5312, out-of-tree board).
---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- add RB tag from Dmitry
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/apss-ipq-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +1 -1
@@ -79,13 +79,13 @@ static const struct alpha_pll_config ipq5018_pll_config = { .test_ctl_hi_val = 0x00400003, }; +/* 1.080 GHz configuration */ static const struct alpha_pll_config ipq5332_pll_config = { .l =0x2d , .config_ctl_val =0x4001075b , .main_output_mask =BIT (0 ), .aux_output_mask =BIT (1 ), .early_output_mask =BIT (3 ), - .alpha_en_mask =BIT (24 ), .status_val =0x3 , .status_mask =GENMASK (10 ,8 ), .lock_det =BIT (2 ),
Signature · 1 line
2.47.0
PATCH v2 3/5 clk: qcom: gcc-ipq6018: remove alpha values from NSS Crypto PLL's config
In reply to Gabor JuhosSince both the 'alpha' and 'alpha_hi' members of the configuration is initialized with zero values, the output rate of the PLL will be the same whether alpha mode is enabled or not.
Remove the initialization of the alpha* members to make it clear that alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the set_rate() op might require that it is enabled already. In this particular case however, the clk_alpha_pll_set_rate() function will get reset the ALPHA_EN bit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.
While at it, also add a comment to indicate the frequency the PLL runs at with the current configuration.
No functional changes, the PLL runs at 1.2 GHz both before and after the change.
Tested on Xiaomi Mi Router AX1800 (IPQ6018, out-of-tree board).
---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- add RB tag from Dmitry
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/gcc-ipq6018.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +1 -3
@@ -4194,10 +4194,9 @@ static const struct alpha_pll_config ubi32_pll_config = { .test_ctl_hi_val = 0x4000, }; +/* 1200 MHz configuration */ static const struct alpha_pll_config nss_crypto_pll_config = { .l =0x32 , - .alpha =0x0 , - .alpha_hi =0x0 , .config_ctl_val =0x4001055b , .main_output_mask =BIT (0 ), .pre_div_val =0x0 ,
@@ -4206,7 +4205,6 @@ static const struct alpha_pll_config nss_crypto_pll_config = { .post_div_mask = GENMASK(11, 8), .vco_mask = GENMASK(21, 20), .vco_val = 0x0, - .alpha_en_mask = BIT(24), };static struct clk_hw *gcc_ipq6018_hws[] = {
Signature · 1 line
2.47.0
PATCH v2 4/5 clk: qcom: dispcc-qcm2290: remove alpha values from disp_cc_pll0_config
In reply to Gabor JuhosSince both the 'alpha' and 'alpha_hi' members of the configuration is initialized (the latter is implicitly) with zero values, the output rate of the PLL will be the same whether alpha mode is enabled or not.
Remove the initialization of the alpha* members to make it clear that the alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the set_rate() op might require that it is enabled already. In this particular case however, the clk_alpha_pll_set_rate() function will get reset the ALPHA_EN bit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.
No functional changes intended, compile tested only.
---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/dispcc-qcm2290.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/qcom/dispcc-qcm2290.c +0 -2
@@ -40,8 +40,6 @@ static const struct pll_vco spark_vco[] = {/* 768MHz configuration */ static const struct alpha_pll_config disp_cc_pll0_config = { .l =0x28 , - .alpha =0x0 , - .alpha_en_mask =BIT (24 ), .vco_val =0x2 <<20 , .vco_mask =GENMASK (21 ,20 ), .main_output_mask =BIT (0 ),
Signature · 1 line
2.47.0
Re: [PATCH v2 4/5] clk: qcom: dispcc-qcm2290: remove alpha values from disp_cc_pll0_config
Quoted 15 lines · Gabor Juhos
Since both the 'alpha' and '
alpha_hi' members of the configuration is initialized (the latter is implicitly) with zero values, the output rate of the PLL will be the same whether alpha mode is enabled or not.Remove the initialization of the alpha* members to make it clear that the alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the
set_rate()op might require that it is enabled already. In this particular case however, theclk_alpha_pll_set_rate()function will get reset theALPHA_ENbit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.No functional changes intended, compile tested only.
Quoted 9 lines
Signed-off-by Gabor Juhos <[email protected]>---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- Link to v1: https://lore.kernel.org/r/[email protected]--- drivers/clk/qcom/dispcc-qcm2290.c | 2 -- 1 file changed, 2 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v2 5/5 clk: qcom: dispcc-sm6115: remove alpha values from disp_cc_pll0_config
In reply to Gabor JuhosSince both the 'alpha' and 'alpha_hi' members of the configuration is initialized (the latter is implicitly) with zero values, the output rate of the PLL will be the same whether alpha mode is enabled or not.
Remove the initialization of the alpha* members to make it clear that the alpha mode is not required to get the desired output rate.
Despite that enabling alpha mode is not needed for the initial configuration, the set_rate() op might require that it is enabled already. In this particular case however, the clk_alpha_pll_set_rate() function will get reset the ALPHA_EN bit when the PLL's rate changes, so dropping 'alpha_en_mask' is safe.
No functional changes intended, compile tested only.
---
Changes in v2:
- extend the commit message to indicate that dropping 'alpha_en_mask' is safe
- add RB tag from Dmitry
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/dispcc-sm6115.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/qcom/dispcc-sm6115.c +0 -2
@@ -48,8 +48,6 @@ static const struct pll_vco spark_vco[] = {/* 768MHz configuration */ static const struct alpha_pll_config disp_cc_pll0_config = { .l =0x28 , - .alpha =0x0 , - .alpha_en_mask =BIT (24 ), .vco_val =0x2 <<20 , .vco_mask =GENMASK (21 ,20 ), .main_output_mask =BIT (0 ),
Signature · 1 line
2.47.0
Quoted 6 lines · Gabor Juhos
There are several alpha PLL configurations, where the alpha mode is enabled even if it is not strictly required in order to get the desired output rate of the PLL. This small series removes those superfluous settings.
Applied, thanks!
[1/5] clk: qcom: apss-ipq-pll: drop 'alpha_en_mask' from IPQ5018 PLL config
commit: 3e632d9c33d8a4f0d8f98e69b56bd2f2145d91c4
[2/5] clk: qcom: apps-ipq-pll: drop 'alpha_en_mask' from IPQ5332 PLL config
commit: 41c5ebfb9b4b42b1479f16a50d96146fa945abce
[3/5] clk: qcom: gcc-ipq6018: remove alpha values from NSS Crypto PLL's config
commit: 5d11fd2a919b153c68cda42c175b4e45668654a9
[4/5] clk: qcom: dispcc-qcm2290: remove alpha values from disp_cc_pll0_config
commit: b9286a91b59fe9c7f8e231fce8e51df3b1442f6b
[5/5] clk: qcom: dispcc-sm6115: remove alpha values from disp_cc_pll0_config
commit: 320f7a476c5fe79f50d00c75debfd9f63a0e713fBest regards,
Signature · 1 line
Bjorn Andersson <[email protected]>