clk: imx: pll14xx: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 10 Jul 2025 21:10:41 +0000 (17:10 -0400)
committerStephen Boyd <sboyd@kernel.org>
Thu, 24 Jul 2025 22:17:35 +0000 (15:17 -0700)
The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/r/20250710-clk-imx-round-rate-v1-9-5726f98e6d8d@redhat.com
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/imx/clk-pll14xx.c

index f290981ea13bdba3602af7aa44aaadfe0b78dcf9..36d0e80b55b80385a065808916187d6d4c30137c 100644 (file)
@@ -216,8 +216,8 @@ found:
                 t->mdiv, t->kdiv);
 }
 
-static long clk_pll1416x_round_rate(struct clk_hw *hw, unsigned long rate,
-                       unsigned long *prate)
+static int clk_pll1416x_determine_rate(struct clk_hw *hw,
+                                      struct clk_rate_request *req)
 {
        struct clk_pll14xx *pll = to_clk_pll14xx(hw);
        const struct imx_pll14xx_rate_table *rate_table = pll->rate_table;
@@ -225,22 +225,29 @@ static long clk_pll1416x_round_rate(struct clk_hw *hw, unsigned long rate,
 
        /* Assuming rate_table is in descending order */
        for (i = 0; i < pll->rate_count; i++)
-               if (rate >= rate_table[i].rate)
-                       return rate_table[i].rate;
+               if (req->rate >= rate_table[i].rate) {
+                       req->rate = rate_table[i].rate;
+
+                       return 0;
+               }
 
        /* return minimum supported value */
-       return rate_table[pll->rate_count - 1].rate;
+       req->rate = rate_table[pll->rate_count - 1].rate;
+
+       return 0;
 }
 
-static long clk_pll1443x_round_rate(struct clk_hw *hw, unsigned long rate,
-                       unsigned long *prate)
+static int clk_pll1443x_determine_rate(struct clk_hw *hw,
+                                      struct clk_rate_request *req)
 {
        struct clk_pll14xx *pll = to_clk_pll14xx(hw);
        struct imx_pll14xx_rate_table t;
 
-       imx_pll14xx_calc_settings(pll, rate, *prate, &t);
+       imx_pll14xx_calc_settings(pll, req->rate, req->best_parent_rate, &t);
+
+       req->rate = t.rate;
 
-       return t.rate;
+       return 0;
 }
 
 static unsigned long clk_pll14xx_recalc_rate(struct clk_hw *hw,
@@ -470,7 +477,7 @@ static const struct clk_ops clk_pll1416x_ops = {
        .unprepare      = clk_pll14xx_unprepare,
        .is_prepared    = clk_pll14xx_is_prepared,
        .recalc_rate    = clk_pll14xx_recalc_rate,
-       .round_rate     = clk_pll1416x_round_rate,
+       .determine_rate = clk_pll1416x_determine_rate,
        .set_rate       = clk_pll1416x_set_rate,
 };
 
@@ -483,7 +490,7 @@ static const struct clk_ops clk_pll1443x_ops = {
        .unprepare      = clk_pll14xx_unprepare,
        .is_prepared    = clk_pll14xx_is_prepared,
        .recalc_rate    = clk_pll14xx_recalc_rate,
-       .round_rate     = clk_pll1443x_round_rate,
+       .determine_rate = clk_pll1443x_determine_rate,
        .set_rate       = clk_pll1443x_set_rate,
 };