mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

clk: meson: dualdiv: switch from .round_rate to .determine_rate

Browse source 
clk_ops.round_rate will be removed at some point. It's replacement is
.determine_rate. Switch clk-dualdiv over to use .determine_rate.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20221225212632.2760126-3-martin.blumenstingl@googlemail.com
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
This commit is contained in:
Martin Blumenstingl 2022-12-25 22:26:30 +01:00 committed by Jerome Brunet
parent 1fd62f262e
commit 581f772566
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/clk/meson/clk-dualdiv.c
View file

@ -86,18 +86,23 @@ __dualdiv_get_setting(unsigned long rate, unsigned long parent_rate,
return (struct meson_clk_dualdiv_param *)&table[best_i]; return (struct meson_clk_dualdiv_param *)&table[best_i];
} }
static long meson_clk_dualdiv_round_rate(struct clk_hw *hw, unsigned long rate, static int meson_clk_dualdiv_determine_rate(struct clk_hw *hw,
unsigned long *parent_rate) struct clk_rate_request *req)
{ {
struct clk_regmap *clk = to_clk_regmap(hw); struct clk_regmap *clk = to_clk_regmap(hw);
struct meson_clk_dualdiv_data *dualdiv = meson_clk_dualdiv_data(clk); struct meson_clk_dualdiv_data *dualdiv = meson_clk_dualdiv_data(clk);
const struct meson_clk_dualdiv_param *setting = const struct meson_clk_dualdiv_param *setting;
__dualdiv_get_setting(rate, *parent_rate, dualdiv);
if (!setting) setting = __dualdiv_get_setting(req->rate, req->best_parent_rate,
return meson_clk_dualdiv_recalc_rate(hw, *parent_rate); dualdiv);
if (setting)
req->rate = __dualdiv_param_to_rate(req->best_parent_rate,
setting);
else
req->rate = meson_clk_dualdiv_recalc_rate(hw,
req->best_parent_rate);
return __dualdiv_param_to_rate(*parent_rate, setting); return 0;
} }
static int meson_clk_dualdiv_set_rate(struct clk_hw *hw, unsigned long rate, static int meson_clk_dualdiv_set_rate(struct clk_hw *hw, unsigned long rate,
@ -122,7 +127,7 @@ static int meson_clk_dualdiv_set_rate(struct clk_hw *hw, unsigned long rate,
const struct clk_ops meson_clk_dualdiv_ops = { const struct clk_ops meson_clk_dualdiv_ops = {
.recalc_rate = meson_clk_dualdiv_recalc_rate, .recalc_rate = meson_clk_dualdiv_recalc_rate,
.round_rate = meson_clk_dualdiv_round_rate, .determine_rate = meson_clk_dualdiv_determine_rate,
.set_rate = meson_clk_dualdiv_set_rate, .set_rate = meson_clk_dualdiv_set_rate,
}; };
EXPORT_SYMBOL_GPL(meson_clk_dualdiv_ops); EXPORT_SYMBOL_GPL(meson_clk_dualdiv_ops);