clk: meson: sclk-div: switch from .round_rate to .determine_rate
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sun, 25 Dec 2022 21:26:31 +0000 (22:26 +0100)
committerJerome Brunet <jbrunet@baylibre.com>
Fri, 13 Jan 2023 14:14:12 +0000 (15:14 +0100)
clk_ops.round_rate will be removed at some point. It's replacement is
.determine_rate. Switch sclk-div over to use .determine_rate.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20221225212632.2760126-4-martin.blumenstingl@googlemail.com
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
drivers/clk/meson/sclk-div.c

index 76d31c0..d12c45c 100644 (file)
@@ -96,16 +96,17 @@ static int sclk_div_bestdiv(struct clk_hw *hw, unsigned long rate,
        return bestdiv;
 }
 
-static long sclk_div_round_rate(struct clk_hw *hw, unsigned long rate,
-                               unsigned long *prate)
+static int sclk_div_determine_rate(struct clk_hw *hw,
+                                  struct clk_rate_request *req)
 {
        struct clk_regmap *clk = to_clk_regmap(hw);
        struct meson_sclk_div_data *sclk = meson_sclk_div_data(clk);
        int div;
 
-       div = sclk_div_bestdiv(hw, rate, prate, sclk);
+       div = sclk_div_bestdiv(hw, req->rate, &req->best_parent_rate, sclk);
+       req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, div);
 
-       return DIV_ROUND_UP_ULL((u64)*prate, div);
+       return 0;
 }
 
 static void sclk_apply_ratio(struct clk_regmap *clk,
@@ -237,7 +238,7 @@ static int sclk_div_init(struct clk_hw *hw)
 
 const struct clk_ops meson_sclk_div_ops = {
        .recalc_rate    = sclk_div_recalc_rate,
-       .round_rate     = sclk_div_round_rate,
+       .determine_rate = sclk_div_determine_rate,
        .set_rate       = sclk_div_set_rate,
        .enable         = sclk_div_enable,
        .disable        = sclk_div_disable,