]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clk: qcom: clk-alpha-pll: drop lucid-evo pll enabled warning
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 22 Oct 2024 08:05:20 +0000 (10:05 +0200)
committerBjorn Andersson <andersson@kernel.org>
Wed, 23 Oct 2024 02:46:35 +0000 (21:46 -0500)
The boot firmware may have left the display enabled and its PLL running,
which currently generates a warning on boot (e.g. on x1e80100):

disp_cc_pll0 PLL is already enabled

Drop the bogus warning and fix up the PLL enabled error handling
(trion_pll_is_enabled() only returns 0 or 1).

Fixes: d1b121d62b7e ("clk: qcom: Add LUCID_EVO PLL type for SDX65")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20241022080521.359-2-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/clk/qcom/clk-alpha-pll.c

index f9105443d7dbb104e3cb091e59f43df25999f8b3..99d6962d25bbb77b89881fc9a5e908f41219fdfd 100644 (file)
@@ -2318,13 +2318,8 @@ static int alpha_pll_lucid_evo_enable(struct clk_hw *hw)
        }
 
        /* Check if PLL is already enabled */
-       ret = trion_pll_is_enabled(pll, regmap);
-       if (ret < 0) {
-               return ret;
-       } else if (ret) {
-               pr_warn("%s PLL is already enabled\n", clk_hw_get_name(&pll->clkr.hw));
+       if (trion_pll_is_enabled(pll, regmap))
                return 0;
-       }
 
        ret = regmap_update_bits(regmap, PLL_MODE(pll), PLL_RESET_N, PLL_RESET_N);
        if (ret)