]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: qcom: gcc-msm8939: Fix mclk0 & mclk1 for 24 MHz
authorVincent Knecht <vincent.knecht@mailoo.org>
Mon, 14 Apr 2025 16:45:12 +0000 (18:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:03 +0000 (11:04 +0100)
[ Upstream commit 9e7acf70cf6aa7b22f67d911f50a8cd510e8fb00 ]

Fix mclk0 & mclk1 parent map to use correct GPLL6 configuration and
freq_tbl to use GPLL6 instead of GPLL0 so that they tick at 24 MHz.

Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller")
Suggested-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org>
Link: https://lore.kernel.org/r/20250414-gcc-msm8939-fixes-mclk-v2-resend2-v2-1-5ddcf572a6de@mailoo.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/qcom/gcc-msm8939.c

index 39ebb443ae3d51a37e39a2def76cd877eeb43f83..a51f5c25782f914eacb4636e82eac91117737760 100644 (file)
@@ -433,7 +433,7 @@ static const struct parent_map gcc_xo_gpll0_gpll1a_gpll6_sleep_map[] = {
        { P_XO, 0 },
        { P_GPLL0, 1 },
        { P_GPLL1_AUX, 2 },
-       { P_GPLL6, 2 },
+       { P_GPLL6, 3 },
        { P_SLEEP_CLK, 6 },
 };
 
@@ -1075,7 +1075,7 @@ static struct clk_rcg2 jpeg0_clk_src = {
 };
 
 static const struct freq_tbl ftbl_gcc_camss_mclk0_1_clk[] = {
-       F(24000000, P_GPLL0, 1, 1, 45),
+       F(24000000, P_GPLL6, 1, 1, 45),
        F(66670000, P_GPLL0, 12, 0, 0),
        { }
 };