]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled
authorSatya Priya Kakitapalli <quic_skakitap@quicinc.com>
Wed, 31 Jul 2024 06:29:11 +0000 (11:59 +0530)
committerBjorn Andersson <andersson@kernel.org>
Thu, 1 Aug 2024 02:56:09 +0000 (21:56 -0500)
Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the
PLL is disabled. However, if the PLL is disabled then LOCK_DET will
never assert and we'll return an error. There is no reason to poll
LOCK_DET if the PLL is already disabled, so skip polling in this case.

Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll")
Cc: stable@vger.kernel.org
Signed-off-by: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240731062916.2680823-4-quic_skakitap@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/clk/qcom/clk-alpha-pll.c

index eb5626095916177cf759f73a1233bb25c3ca48dd..2ebeb277cb4d064e9a700ac4c739c5315160227a 100644 (file)
@@ -2136,6 +2136,9 @@ static int clk_zonda_pll_set_rate(struct clk_hw *hw, unsigned long rate,
        regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
        regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
 
+       if (!clk_hw_is_enabled(hw))
+               return 0;
+
        /* Wait before polling for the frequency latch */
        udelay(5);