]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
clk: imx: frac-pll: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 10 Jul 2025 21:10:39 +0000 (17:10 -0400)
committerStephen Boyd <sboyd@kernel.org>
Thu, 24 Jul 2025 22:17:23 +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-7-5726f98e6d8d@redhat.com
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/imx/clk-frac-pll.c

index c703056fae85cca492b2edcfaadab58fd13c6b5a..eb668faaa38fd085f90bd1c01811e0deba5d0102 100644 (file)
@@ -119,19 +119,19 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hw,
        return rate;
 }
 
-static long clk_pll_round_rate(struct clk_hw *hw, unsigned long rate,
-                              unsigned long *prate)
+static int clk_pll_determine_rate(struct clk_hw *hw,
+                                 struct clk_rate_request *req)
 {
-       u64 parent_rate = *prate;
+       u64 parent_rate = req->best_parent_rate;
        u32 divff, divfi;
        u64 temp64;
 
        parent_rate *= 8;
-       rate *= 2;
-       temp64 = rate;
+       req->rate *= 2;
+       temp64 = req->rate;
        do_div(temp64, parent_rate);
        divfi = temp64;
-       temp64 = rate - divfi * parent_rate;
+       temp64 = req->rate - divfi * parent_rate;
        temp64 *= PLL_FRAC_DENOM;
        do_div(temp64, parent_rate);
        divff = temp64;
@@ -140,9 +140,11 @@ static long clk_pll_round_rate(struct clk_hw *hw, unsigned long rate,
        temp64 *= divff;
        do_div(temp64, PLL_FRAC_DENOM);
 
-       rate = parent_rate * divfi + temp64;
+       req->rate = parent_rate * divfi + temp64;
+
+       req->rate = req->rate / 2;
 
-       return rate / 2;
+       return 0;
 }
 
 /*
@@ -198,7 +200,7 @@ static const struct clk_ops clk_frac_pll_ops = {
        .unprepare      = clk_pll_unprepare,
        .is_prepared    = clk_pll_is_prepared,
        .recalc_rate    = clk_pll_recalc_rate,
-       .round_rate     = clk_pll_round_rate,
+       .determine_rate = clk_pll_determine_rate,
        .set_rate       = clk_pll_set_rate,
 };