admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'peci-next-6.19-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-next

Browse Source 
Iwona writes:

Update peci-next for v6.19-rc1

A small change in peci-aspeed converting the driver away from deprecated
round_rate(), allowing it to eventually be removed from clk subsystem.

* tag 'peci-next-6.19-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/iwi/linux:
  peci: controller: peci-aspeed: convert from round_rate() to determine_rate()
This commit is contained in:
Greg Kroah-Hartman
2025-11-13 17:54:22 -05:00
parent c428900703 3112b589d3
commit e3d63f4ef3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/peci/controller/peci-aspeed.c
View File

@@ -362,12 +362,14 @@ static int clk_aspeed_peci_set_rate(struct clk_hw *hw, unsigned long rate,
return 0; return 0;
} }
static long clk_aspeed_peci_round_rate(struct clk_hw *hw, unsigned long rate, static int clk_aspeed_peci_determine_rate(struct clk_hw *hw,
unsigned long *prate) struct clk_rate_request *req)
{ {
int div = clk_aspeed_peci_get_div(rate, prate); int div = clk_aspeed_peci_get_div(req->rate, &req->best_parent_rate);
return DIV_ROUND_UP_ULL(*prate, div); req->rate = DIV_ROUND_UP_ULL(req->best_parent_rate, div);
return 0;
} }
static unsigned long clk_aspeed_peci_recalc_rate(struct clk_hw *hw, unsigned long prate) static unsigned long clk_aspeed_peci_recalc_rate(struct clk_hw *hw, unsigned long prate)
@@ -394,7 +396,7 @@ static unsigned long clk_aspeed_peci_recalc_rate(struct clk_hw *hw, unsigned lon
static const struct clk_ops clk_aspeed_peci_ops = { static const struct clk_ops clk_aspeed_peci_ops = {
.set_rate = clk_aspeed_peci_set_rate, .set_rate = clk_aspeed_peci_set_rate,
.round_rate = clk_aspeed_peci_round_rate, .determine_rate = clk_aspeed_peci_determine_rate,
.recalc_rate = clk_aspeed_peci_recalc_rate, .recalc_rate = clk_aspeed_peci_recalc_rate,
}; };