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