Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: qcom: cpu-8996: move ACD logic to clk_cpu_8996_pmux_determine_rate

Rather than telling everybody that we are using PLL as a parent (and
using ACD clock instead) properly select ACD as a pmux parent clock.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220714100351.1834711-5-dmitry.baryshkov@linaro.org

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson
81165aca f1e3fcc4

+2 -5
+2 -5
drivers/clk/qcom/clk-cpu-8996.c
··· 284 284 u32 val; 285 285 286 286 val = index; 287 - /* We always want ACD when using the primary PLL */ 288 - if (val == PLL_INDEX) 289 - val = ACD_INDEX; 290 287 val <<= cpuclk->shift; 291 288 292 289 return regmap_update_bits(clkr->regmap, cpuclk->reg, mask, val); ··· 368 371 .reg = PWRCL_REG_OFFSET + MUX_OFFSET, 369 372 .shift = 0, 370 373 .width = 2, 371 - .pll = &pwrcl_pll.clkr.hw, 374 + .pll = &pwrcl_pll_acd.clkr.hw, 372 375 .pll_div_2 = &pwrcl_smux.clkr.hw, 373 376 .nb.notifier_call = cpu_clk_notifier_cb, 374 377 .clkr.hw.init = &(struct clk_init_data) { ··· 385 388 .reg = PERFCL_REG_OFFSET + MUX_OFFSET, 386 389 .shift = 0, 387 390 .width = 2, 388 - .pll = &perfcl_pll.clkr.hw, 391 + .pll = &perfcl_pll_acd.clkr.hw, 389 392 .pll_div_2 = &perfcl_smux.clkr.hw, 390 393 .nb.notifier_call = cpu_clk_notifier_cb, 391 394 .clkr.hw.init = &(struct clk_init_data) {