mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-28 03:54:36 +00:00
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
From 3a1d65dcdcdd2201dacf97eb5394bec9f4677297 Mon Sep 17 00:00:00 2001
|
|
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Date: Mon, 26 Dec 2022 04:41:46 +0000
|
|
Subject: [PATCH 027/120] FROMGIT(6.3): clk: meson: mpll: Switch from
|
|
.round_rate to .determine_rate
|
|
|
|
clk_ops.round_rate will be removed at some point. It's replacement is
|
|
.determine_rate. Switch clk-mpll over to use .determine_rate.
|
|
|
|
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
---
|
|
drivers/clk/meson/clk-mpll.c | 20 +++++++++++++-------
|
|
1 file changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c
|
|
index fc9df4860872..20255e129b37 100644
|
|
--- a/drivers/clk/meson/clk-mpll.c
|
|
+++ b/drivers/clk/meson/clk-mpll.c
|
|
@@ -87,16 +87,22 @@ static unsigned long mpll_recalc_rate(struct clk_hw *hw,
|
|
return rate < 0 ? 0 : rate;
|
|
}
|
|
|
|
-static long mpll_round_rate(struct clk_hw *hw,
|
|
- unsigned long rate,
|
|
- unsigned long *parent_rate)
|
|
+static int mpll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct meson_clk_mpll_data *mpll = meson_clk_mpll_data(clk);
|
|
unsigned int sdm, n2;
|
|
+ long rate;
|
|
+
|
|
+ params_from_rate(req->rate, req->best_parent_rate, &sdm, &n2,
|
|
+ mpll->flags);
|
|
|
|
- params_from_rate(rate, *parent_rate, &sdm, &n2, mpll->flags);
|
|
- return rate_from_params(*parent_rate, sdm, n2);
|
|
+ rate = rate_from_params(req->best_parent_rate, sdm, n2);
|
|
+ if (rate < 0)
|
|
+ return rate;
|
|
+
|
|
+ req->rate = rate;
|
|
+ return 0;
|
|
}
|
|
|
|
static int mpll_set_rate(struct clk_hw *hw,
|
|
@@ -157,13 +163,13 @@ static int mpll_init(struct clk_hw *hw)
|
|
|
|
const struct clk_ops meson_clk_mpll_ro_ops = {
|
|
.recalc_rate = mpll_recalc_rate,
|
|
- .round_rate = mpll_round_rate,
|
|
+ .determine_rate = mpll_determine_rate,
|
|
};
|
|
EXPORT_SYMBOL_GPL(meson_clk_mpll_ro_ops);
|
|
|
|
const struct clk_ops meson_clk_mpll_ops = {
|
|
.recalc_rate = mpll_recalc_rate,
|
|
- .round_rate = mpll_round_rate,
|
|
+ .determine_rate = mpll_determine_rate,
|
|
.set_rate = mpll_set_rate,
|
|
.init = mpll_init,
|
|
};
|
|
--
|
|
2.34.1
|
|
|