clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux

Don't store pointers to parents in struct clk_cpu_8996_pmux. Instead use
clk_hw_get_parent_by_index to fetch them.

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-6-dmitry.baryshkov@linaro.org

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index 5c5adcb533ce8c188ea66f3a2573c82c712abb95..0a336adb02b50798b4ab658503c2f71ebaf38f8d 100644 (file)
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -247,8 +247,6 @@ struct clk_cpu_8996_pmux {
        u8      shift;
        u8      width;
        struct notifier_block nb;
-       struct clk_hw   *pll;
-       struct clk_hw   *pll_div_2;
        struct clk_regmap clkr;
 };
 
@@ -292,15 +290,17 @@ static int clk_cpu_8996_pmux_set_parent(struct clk_hw *hw, u8 index)
 static int clk_cpu_8996_pmux_determine_rate(struct clk_hw *hw,
                                           struct clk_rate_request *req)
 {
-       struct clk_cpu_8996_pmux *cpuclk = to_clk_cpu_8996_pmux_hw(hw);
-       struct clk_hw *parent = cpuclk->pll;
+       struct clk_hw *parent;
 
-       if (cpuclk->pll_div_2 && req->rate < DIV_2_THRESHOLD) {
-               if (req->rate < (DIV_2_THRESHOLD / 2))
-                       return -EINVAL;
+       if (req->rate < (DIV_2_THRESHOLD / 2))
+               return -EINVAL;
 
-               parent = cpuclk->pll_div_2;
-       }
+       if (req->rate < DIV_2_THRESHOLD)
+               parent = clk_hw_get_parent_by_index(hw, SMUX_INDEX);
+       else
+               parent = clk_hw_get_parent_by_index(hw, ACD_INDEX);
+       if (!parent)
+               return -EINVAL;
 
        req->best_parent_rate = clk_hw_round_rate(parent, req->rate);
        req->best_parent_hw = parent;
@@ -368,8 +368,6 @@ static struct clk_cpu_8996_pmux pwrcl_pmux = {
        .reg = PWRCL_REG_OFFSET + MUX_OFFSET,
        .shift = 0,
        .width = 2,
-       .pll = &pwrcl_pll_acd.clkr.hw,
-       .pll_div_2 = &pwrcl_smux.clkr.hw,
        .nb.notifier_call = cpu_clk_notifier_cb,
        .clkr.hw.init = &(struct clk_init_data) {
                .name = "pwrcl_pmux",
@@ -385,8 +383,6 @@ static struct clk_cpu_8996_pmux perfcl_pmux = {
        .reg = PERFCL_REG_OFFSET + MUX_OFFSET,
        .shift = 0,
        .width = 2,
-       .pll = &perfcl_pll_acd.clkr.hw,
-       .pll_div_2 = &perfcl_smux.clkr.hw,
        .nb.notifier_call = cpu_clk_notifier_cb,
        .clkr.hw.init = &(struct clk_init_data) {
                .name = "perfcl_pmux",