mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-24 10:16:18 +00:00
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 450b9f39897989b1f1f9c1efe5a07417d7ef04cf Mon Sep 17 00:00:00 2001
|
|
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Date: Mon, 26 Dec 2022 04:43:33 +0000
|
|
Subject: [PATCH 029/120] FROMGIT(6.3): clk: meson: sclk-div: switch from
|
|
.round_rate to .determine_rate
|
|
|
|
clk_ops.round_rate will be removed at some point. It's replacement is
|
|
.determine_rate. Switch sclk-div over to use .determine_rate.
|
|
|
|
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
---
|
|
drivers/clk/meson/sclk-div.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/clk/meson/sclk-div.c b/drivers/clk/meson/sclk-div.c
|
|
index 76d31c0a3342..d12c45c4c261 100644
|
|
--- a/drivers/clk/meson/sclk-div.c
|
|
+++ b/drivers/clk/meson/sclk-div.c
|
|
@@ -96,16 +96,17 @@ static int sclk_div_bestdiv(struct clk_hw *hw, unsigned long rate,
|
|
return bestdiv;
|
|
}
|
|
|
|
-static long sclk_div_round_rate(struct clk_hw *hw, unsigned long rate,
|
|
- unsigned long *prate)
|
|
+static int sclk_div_determine_rate(struct clk_hw *hw,
|
|
+ struct clk_rate_request *req)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct meson_sclk_div_data *sclk = meson_sclk_div_data(clk);
|
|
int div;
|
|
|
|
- div = sclk_div_bestdiv(hw, rate, prate, sclk);
|
|
+ div = sclk_div_bestdiv(hw, req->rate, &req->best_parent_rate, sclk);
|
|
+ req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, div);
|
|
|
|
- return DIV_ROUND_UP_ULL((u64)*prate, div);
|
|
+ return 0;
|
|
}
|
|
|
|
static void sclk_apply_ratio(struct clk_regmap *clk,
|
|
@@ -237,7 +238,7 @@ static int sclk_div_init(struct clk_hw *hw)
|
|
|
|
const struct clk_ops meson_sclk_div_ops = {
|
|
.recalc_rate = sclk_div_recalc_rate,
|
|
- .round_rate = sclk_div_round_rate,
|
|
+ .determine_rate = sclk_div_determine_rate,
|
|
.set_rate = sclk_div_set_rate,
|
|
.enable = sclk_div_enable,
|
|
.disable = sclk_div_disable,
|
|
--
|
|
2.34.1
|
|
|