[1/2] clk: qcom: gcc-ipq6018: update UBI32 PLL

Message ID 20230526190855.2941291-1-robimarko@gmail.com
State New
Headers
Series [1/2] clk: qcom: gcc-ipq6018: update UBI32 PLL |

Commit Message

Robert Marko May 26, 2023, 7:08 p.m. UTC
  Update the UBI32 alpha PLL config to the latest values from the downstream
QCA 5.4 kernel.

Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 drivers/clk/qcom/gcc-ipq6018.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
  

Comments

Konrad Dybcio May 26, 2023, 8:51 p.m. UTC | #1
On 26.05.2023 21:08, Robert Marko wrote:
> Update the UBI32 alpha PLL config to the latest values from the downstream
> QCA 5.4 kernel.
> 
> Signed-off-by: Robert Marko <robimarko@gmail.com>
> ---
>  drivers/clk/qcom/gcc-ipq6018.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
> index 350ead66914ca..abd97b939850f 100644
> --- a/drivers/clk/qcom/gcc-ipq6018.c
> +++ b/drivers/clk/qcom/gcc-ipq6018.c
> @@ -4149,15 +4149,20 @@ static struct clk_branch gcc_dcc_clk = {
>  
>  static const struct alpha_pll_config ubi32_pll_config = {
>  	.l = 0x3e,
> -	.alpha = 0x57,
> +	.alpha = 0x6667,
>  	.config_ctl_val = 0x240d6aa8,
>  	.config_ctl_hi_val = 0x3c2,
> +	.config_ctl_val = 0x240d4828,
> +	.config_ctl_hi_val = 0x6,
>  	.main_output_mask = BIT(0),
>  	.aux_output_mask = BIT(1),
>  	.pre_div_val = 0x0,
>  	.pre_div_mask = BIT(12),
>  	.post_div_val = 0x0,
>  	.post_div_mask = GENMASK(9, 8),
> +	.alpha_en_mask = BIT(24),
> +	.test_ctl_val = 0x1C0000C0,
Please use lowercase hex.

Konrad
> +	.test_ctl_hi_val = 0x4000,
>  };
>  
>  static const struct alpha_pll_config nss_crypto_pll_config = {
  
Bjorn Andersson May 27, 2023, 1:07 a.m. UTC | #2
On Fri, 26 May 2023 21:08:54 +0200, Robert Marko wrote:
> Update the UBI32 alpha PLL config to the latest values from the downstream
> QCA 5.4 kernel.
> 
> 

Applied, thanks!

[1/2] clk: qcom: gcc-ipq6018: update UBI32 PLL
      commit: f4f0c8acee0e41c5fbae7a7ad06087668ddce0d6
[2/2] clk: qcom: ipq6018: fix networking resets
      commit: 349b5bed539b491b7894a5186a895751fd8ba6c7

Best regards,
  

Patch

diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
index 350ead66914ca..abd97b939850f 100644
--- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -4149,15 +4149,20 @@  static struct clk_branch gcc_dcc_clk = {
 
 static const struct alpha_pll_config ubi32_pll_config = {
 	.l = 0x3e,
-	.alpha = 0x57,
+	.alpha = 0x6667,
 	.config_ctl_val = 0x240d6aa8,
 	.config_ctl_hi_val = 0x3c2,
+	.config_ctl_val = 0x240d4828,
+	.config_ctl_hi_val = 0x6,
 	.main_output_mask = BIT(0),
 	.aux_output_mask = BIT(1),
 	.pre_div_val = 0x0,
 	.pre_div_mask = BIT(12),
 	.post_div_val = 0x0,
 	.post_div_mask = GENMASK(9, 8),
+	.alpha_en_mask = BIT(24),
+	.test_ctl_val = 0x1C0000C0,
+	.test_ctl_hi_val = 0x4000,
 };
 
 static const struct alpha_pll_config nss_crypto_pll_config = {