]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
clk: qcom: gcc-sm6115: Add missing PLL config properties
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Thu, 1 Jun 2023 09:39:08 +0000 (11:39 +0200)
committerBjorn Andersson <andersson@kernel.org>
Tue, 13 Jun 2023 23:15:04 +0000 (16:15 -0700)
When the driver was ported upstream, PLL ctl register values were omitted.
Add them to ensure the PLLs are fully configured like we expect them to.

Fixes: cbe63bfdc54f ("clk: qcom: Add Global Clock controller (GCC) driver for SM6115")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Iskren Chernev <me@iskren.info>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230601-topic-alpha_ctl-v1-2-b6a932dfcf68@linaro.org
drivers/clk/qcom/gcc-sm6115.c

index 5f09aefa7fb927c856f97f2916b1320816358334..033e308ff865a7719ed88ca56ee2d13470f97187 100644 (file)
@@ -119,6 +119,8 @@ static const struct alpha_pll_config gpll10_config = {
        .vco_mask = GENMASK(21, 20),
        .main_output_mask = BIT(0),
        .config_ctl_val = 0x4001055b,
+       .test_ctl_hi1_val = 0x1,
+       .test_ctl_hi_mask = 0x1,
 };
 
 static struct clk_alpha_pll gpll10 = {
@@ -170,6 +172,8 @@ static const struct alpha_pll_config gpll11_config = {
        .vco_val = 0x2 << 20,
        .vco_mask = GENMASK(21, 20),
        .config_ctl_val = 0x4001055b,
+       .test_ctl_hi1_val = 0x1,
+       .test_ctl_hi_mask = 0x1,
 };
 
 static struct clk_alpha_pll gpll11 = {
@@ -362,6 +366,8 @@ static const struct alpha_pll_config gpll8_config = {
        .post_div_val = 0x1 << 8,
        .post_div_mask = GENMASK(11, 8),
        .config_ctl_val = 0x4001055b,
+       .test_ctl_hi1_val = 0x1,
+       .test_ctl_hi_mask = 0x1,
 };
 
 static struct clk_alpha_pll gpll8 = {
@@ -413,6 +419,8 @@ static const struct alpha_pll_config gpll9_config = {
        .post_div_mask = GENMASK(9, 8),
        .main_output_mask = BIT(0),
        .config_ctl_val = 0x00004289,
+       .test_ctl_mask = GENMASK(31, 0),
+       .test_ctl_val = 0x08000000,
 };
 
 static struct clk_alpha_pll gpll9 = {