0049-v6.6-clk-qcom-gcc-ipq6018-remove-duplicate-initializers.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 5ae7899765607e97e5eb34486336898c8d9ec654 Mon Sep 17 00:00:00 2001
  2. From: Arnd Bergmann <[email protected]>
  3. Date: Thu, 1 Jun 2023 23:34:12 +0200
  4. Subject: [PATCH] clk: qcom: gcc-ipq6018: remove duplicate initializers
  5. A recent change added new initializers for .config_ctl_val and
  6. .config_ctl_hi_val but left the old values in place:
  7. drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
  8. 4155 | .config_ctl_val = 0x240d4828,
  9. | ^~~~~~~~~~
  10. drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
  11. 4156 | .config_ctl_hi_val = 0x6,
  12. | ^~~
  13. Remove the unused ones now to avoid confusion.
  14. Fixes: f4f0c8acee0e4 ("clk: qcom: gcc-ipq6018: update UBI32 PLL")
  15. Signed-off-by: Arnd Bergmann <[email protected]>
  16. Reviewed-by: Robert Marko <[email protected]>
  17. Reviewed-by: Dmitry Baryshkov <[email protected]>
  18. Signed-off-by: Bjorn Andersson <[email protected]>
  19. Link: https://lore.kernel.org/r/[email protected]
  20. ---
  21. drivers/clk/qcom/gcc-ipq6018.c | 2 --
  22. 1 file changed, 2 deletions(-)
  23. --- a/drivers/clk/qcom/gcc-ipq6018.c
  24. +++ b/drivers/clk/qcom/gcc-ipq6018.c
  25. @@ -4144,8 +4144,6 @@ static struct clk_branch gcc_dcc_clk = {
  26. static const struct alpha_pll_config ubi32_pll_config = {
  27. .l = 0x3e,
  28. .alpha = 0x6667,
  29. - .config_ctl_val = 0x240d6aa8,
  30. - .config_ctl_hi_val = 0x3c2,
  31. .config_ctl_val = 0x240d4828,
  32. .config_ctl_hi_val = 0x6,
  33. .main_output_mask = BIT(0),