Skip to content

Commit 1fd62f2

Browse files
xdarklightjbrun3t
authored andcommitted
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> Acked-by: Stephen Boyd <sboyd@kernel.org> Link: https://lore.kernel.org/r/20221225212632.2760126-2-martin.blumenstingl@googlemail.com Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
1 parent 1b929c0 commit 1fd62f2

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

drivers/clk/meson/clk-mpll.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,22 @@ static unsigned long mpll_recalc_rate(struct clk_hw *hw,
8787
return rate < 0 ? 0 : rate;
8888
}
8989

90-
static long mpll_round_rate(struct clk_hw *hw,
91-
unsigned long rate,
92-
unsigned long *parent_rate)
90+
static int mpll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
9391
{
9492
struct clk_regmap *clk = to_clk_regmap(hw);
9593
struct meson_clk_mpll_data *mpll = meson_clk_mpll_data(clk);
9694
unsigned int sdm, n2;
95+
long rate;
96+
97+
params_from_rate(req->rate, req->best_parent_rate, &sdm, &n2,
98+
mpll->flags);
9799

98-
params_from_rate(rate, *parent_rate, &sdm, &n2, mpll->flags);
99-
return rate_from_params(*parent_rate, sdm, n2);
100+
rate = rate_from_params(req->best_parent_rate, sdm, n2);
101+
if (rate < 0)
102+
return rate;
103+
104+
req->rate = rate;
105+
return 0;
100106
}
101107

102108
static int mpll_set_rate(struct clk_hw *hw,
@@ -157,13 +163,13 @@ static int mpll_init(struct clk_hw *hw)
157163

158164
const struct clk_ops meson_clk_mpll_ro_ops = {
159165
.recalc_rate = mpll_recalc_rate,
160-
.round_rate = mpll_round_rate,
166+
.determine_rate = mpll_determine_rate,
161167
};
162168
EXPORT_SYMBOL_GPL(meson_clk_mpll_ro_ops);
163169

164170
const struct clk_ops meson_clk_mpll_ops = {
165171
.recalc_rate = mpll_recalc_rate,
166-
.round_rate = mpll_round_rate,
172+
.determine_rate = mpll_determine_rate,
167173
.set_rate = mpll_set_rate,
168174
.init = mpll_init,
169175
};

0 commit comments

Comments
 (0)