mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 17:18:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: microchip: core: convert from round_rate() to determine_rate()

Browse source 
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>
This commit is contained in:
Brian Masney 2025-08-11 11:19:15 -04:00
parent 5c2b6d0fdb
commit e9f039c08c
1 changed files with 27 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/clk/microchip/clk-core.c
View file

@ -155,11 +155,13 @@ static unsigned long pbclk_recalc_rate(struct clk_hw *hw,
return parent_rate / pbclk_read_pbdiv(pb); return parent_rate / pbclk_read_pbdiv(pb);
} }
static long pbclk_round_rate(struct clk_hw *hw, unsigned long rate, static int pbclk_determine_rate(struct clk_hw *hw,
unsigned long *parent_rate) struct clk_rate_request *req)
{ {
return calc_best_divided_rate(rate, *parent_rate, req->rate = calc_best_divided_rate(req->rate, req->best_parent_rate,
PB_DIV_MAX, PB_DIV_MIN); PB_DIV_MAX, PB_DIV_MIN);
return 0;
} }
static int pbclk_set_rate(struct clk_hw *hw, unsigned long rate, static int pbclk_set_rate(struct clk_hw *hw, unsigned long rate,
@ -207,7 +209,7 @@ const struct clk_ops pic32_pbclk_ops = {
.disable = pbclk_disable, .disable = pbclk_disable,
.is_enabled = pbclk_is_enabled, .is_enabled = pbclk_is_enabled,
.recalc_rate = pbclk_recalc_rate, .recalc_rate = pbclk_recalc_rate,
.round_rate = pbclk_round_rate, .determine_rate = pbclk_determine_rate,
.set_rate = pbclk_set_rate, .set_rate = pbclk_set_rate,
}; };
@ -372,16 +374,18 @@ static unsigned long roclk_recalc_rate(struct clk_hw *hw,
return roclk_calc_rate(parent_rate, rodiv, rotrim); return roclk_calc_rate(parent_rate, rodiv, rotrim);
} }
static long roclk_round_rate(struct clk_hw *hw, unsigned long rate, static int roclk_determine_rate(struct clk_hw *hw,
unsigned long *parent_rate) struct clk_rate_request *req)
{ {
u32 rotrim, rodiv; u32 rotrim, rodiv;
/* calculate dividers for new rate */ /* calculate dividers for new rate */
roclk_calc_div_trim(rate, *parent_rate, &rodiv, &rotrim); roclk_calc_div_trim(req->rate, req->best_parent_rate, &rodiv, &rotrim);
/* caclulate new rate (rounding) based on new rodiv & rotrim */ /* caclulate new rate (rounding) based on new rodiv & rotrim */
return roclk_calc_rate(*parent_rate, rodiv, rotrim); req->rate = roclk_calc_rate(req->best_parent_rate, rodiv, rotrim);
return 0;
} }
static int roclk_determine_rate(struct clk_hw *hw, static int roclk_determine_rate(struct clk_hw *hw,
@ -665,12 +669,15 @@ static unsigned long spll_clk_recalc_rate(struct clk_hw *hw,
return rate64; return rate64;
} }
static long spll_clk_round_rate(struct clk_hw *hw, unsigned long rate, static int spll_clk_determine_rate(struct clk_hw *hw,
unsigned long *parent_rate) struct clk_rate_request *req)
{ {
struct pic32_sys_pll *pll = clkhw_to_spll(hw); struct pic32_sys_pll *pll = clkhw_to_spll(hw);
return spll_calc_mult_div(pll, rate, *parent_rate, NULL, NULL); req->rate = spll_calc_mult_div(pll, req->rate, req->best_parent_rate,
NULL, NULL);
return 0;
} }
static int spll_clk_set_rate(struct clk_hw *hw, unsigned long rate, static int spll_clk_set_rate(struct clk_hw *hw, unsigned long rate,
@ -725,7 +732,7 @@ static int spll_clk_set_rate(struct clk_hw *hw, unsigned long rate,
/* SPLL clock operation */ /* SPLL clock operation */
const struct clk_ops pic32_spll_ops = { const struct clk_ops pic32_spll_ops = {
.recalc_rate = spll_clk_recalc_rate, .recalc_rate = spll_clk_recalc_rate,
.round_rate = spll_clk_round_rate, .determine_rate = spll_clk_determine_rate,
.set_rate = spll_clk_set_rate, .set_rate = spll_clk_set_rate,
}; };
@ -780,10 +787,13 @@ static unsigned long sclk_get_rate(struct clk_hw *hw, unsigned long parent_rate)
return parent_rate / div; return parent_rate / div;
} }
static long sclk_round_rate(struct clk_hw *hw, unsigned long rate, static int sclk_determine_rate(struct clk_hw *hw,
unsigned long *parent_rate) struct clk_rate_request *req)
{ {
return calc_best_divided_rate(rate, *parent_rate, SLEW_SYSDIV, 1); req->rate = calc_best_divided_rate(req->rate, req->best_parent_rate,
SLEW_SYSDIV, 1);
return 0;
} }
static int sclk_set_rate(struct clk_hw *hw, static int sclk_set_rate(struct clk_hw *hw,
@ -909,7 +919,7 @@ static int sclk_init(struct clk_hw *hw)
const struct clk_ops pic32_sclk_ops = { const struct clk_ops pic32_sclk_ops = {
.get_parent = sclk_get_parent, .get_parent = sclk_get_parent,
.set_parent = sclk_set_parent, .set_parent = sclk_set_parent,
.round_rate = sclk_round_rate, .determine_rate = sclk_determine_rate,
.set_rate = sclk_set_rate, .set_rate = sclk_set_rate,
.recalc_rate = sclk_get_rate, .recalc_rate = sclk_get_rate,
.init = sclk_init, .init = sclk_init,