Skip to content

Commit e308a27

Browse files
masneybAndi Shyti
authored andcommitted
i2c: busses: bcm2835: convert from round_rate() to determine_rate()
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
1 parent 4cdcdbe commit e308a27

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/i2c/busses/i2c-bcm2835.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,14 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
137137
return 0;
138138
}
139139

140-
static long clk_bcm2835_i2c_round_rate(struct clk_hw *hw, unsigned long rate,
141-
unsigned long *parent_rate)
140+
static int clk_bcm2835_i2c_determine_rate(struct clk_hw *hw,
141+
struct clk_rate_request *req)
142142
{
143-
u32 divider = clk_bcm2835_i2c_calc_divider(rate, *parent_rate);
143+
u32 divider = clk_bcm2835_i2c_calc_divider(req->rate, req->best_parent_rate);
144144

145-
return DIV_ROUND_UP(*parent_rate, divider);
145+
req->rate = DIV_ROUND_UP(req->best_parent_rate, divider);
146+
147+
return 0;
146148
}
147149

148150
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,
156158

157159
static const struct clk_ops clk_bcm2835_i2c_ops = {
158160
.set_rate = clk_bcm2835_i2c_set_rate,
159-
.round_rate = clk_bcm2835_i2c_round_rate,
161+
.determine_rate = clk_bcm2835_i2c_determine_rate,
160162
.recalc_rate = clk_bcm2835_i2c_recalc_rate,
161163
};
162164

0 commit comments

Comments
 (0)