39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 5ae7899765607e97e5eb34486336898c8d9ec654 Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Thu, 1 Jun 2023 23:34:12 +0200
|
|
Subject: [PATCH] clk: qcom: gcc-ipq6018: remove duplicate initializers
|
|
|
|
A recent change added new initializers for .config_ctl_val and
|
|
.config_ctl_hi_val but left the old values in place:
|
|
|
|
drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
|
|
4155 | .config_ctl_val = 0x240d4828,
|
|
| ^~~~~~~~~~
|
|
drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
|
|
4156 | .config_ctl_hi_val = 0x6,
|
|
| ^~~
|
|
|
|
Remove the unused ones now to avoid confusion.
|
|
|
|
Fixes: f4f0c8acee0e4 ("clk: qcom: gcc-ipq6018: update UBI32 PLL")
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Reviewed-by: Robert Marko <robimarko@gmail.com>
|
|
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230601213416.3373599-1-arnd@kernel.org
|
|
---
|
|
drivers/clk/qcom/gcc-ipq6018.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
|
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
|
@@ -4144,8 +4144,6 @@ static struct clk_branch gcc_dcc_clk = {
|
|
static const struct alpha_pll_config ubi32_pll_config = {
|
|
.l = 0x3e,
|
|
.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),
|