Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'peci-next-6.19-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-next
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()
+7
-5
+7
-5
drivers/peci/controller/peci-aspeed.c
+7
-5
drivers/peci/controller/peci-aspeed.c
···
362
362
return 0;
363
363
}
364
364
365
-
static long clk_aspeed_peci_round_rate(struct clk_hw *hw, unsigned long rate,
366
-
unsigned long *prate)
365
+
static int clk_aspeed_peci_determine_rate(struct clk_hw *hw,
366
+
struct clk_rate_request *req)
367
367
{
368
-
int div = clk_aspeed_peci_get_div(rate, prate);
368
+
int div = clk_aspeed_peci_get_div(req->rate, &req->best_parent_rate);
369
369
370
-
return DIV_ROUND_UP_ULL(*prate, div);
370
+
req->rate = DIV_ROUND_UP_ULL(req->best_parent_rate, div);
371
+
372
+
return 0;
371
373
}
372
374
373
375
static unsigned long clk_aspeed_peci_recalc_rate(struct clk_hw *hw, unsigned long prate)
···
396
394
397
395
static const struct clk_ops clk_aspeed_peci_ops = {
398
396
.set_rate = clk_aspeed_peci_set_rate,
399
-
.round_rate = clk_aspeed_peci_round_rate,
397
+
.determine_rate = clk_aspeed_peci_determine_rate,
400
398
.recalc_rate = clk_aspeed_peci_recalc_rate,
401
399
};
402
400