]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
i2c: busses: bcm2835: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 16 Oct 2025 16:08:12 +0000 (12:08 -0400)
committerAndi Shyti <andi.shyti@kernel.org>
Mon, 27 Oct 2025 13:17:14 +0000 (14:17 +0100)
The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate().

Signed-off-by: Brian Masney <bmasney@redhat.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20251016-i2c-round-rate-resend-v1-1-96dd1d725e8f@redhat.com
drivers/i2c/busses/i2c-bcm2835.c

index 8554e790f8e36c5a1cf56c0aab8556b377f2bbdf..0d7e2654a534e92a529f27fdc049812359678522 100644 (file)
@@ -137,12 +137,14 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
        return 0;
 }
 
-static long clk_bcm2835_i2c_round_rate(struct clk_hw *hw, unsigned long rate,
-                               unsigned long *parent_rate)
+static int clk_bcm2835_i2c_determine_rate(struct clk_hw *hw,
+                                         struct clk_rate_request *req)
 {
-       u32 divider = clk_bcm2835_i2c_calc_divider(rate, *parent_rate);
+       u32 divider = clk_bcm2835_i2c_calc_divider(req->rate, req->best_parent_rate);
 
-       return DIV_ROUND_UP(*parent_rate, divider);
+       req->rate = DIV_ROUND_UP(req->best_parent_rate, divider);
+
+       return 0;
 }
 
 static unsigned long clk_bcm2835_i2c_recalc_rate(struct clk_hw *hw,
@@ -156,7 +158,7 @@ static unsigned long clk_bcm2835_i2c_recalc_rate(struct clk_hw *hw,
 
 static const struct clk_ops clk_bcm2835_i2c_ops = {
        .set_rate = clk_bcm2835_i2c_set_rate,
-       .round_rate = clk_bcm2835_i2c_round_rate,
+       .determine_rate = clk_bcm2835_i2c_determine_rate,
        .recalc_rate = clk_bcm2835_i2c_recalc_rate,
 };