Commit 9ac32394 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Jerome Brunet
Browse files

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: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20221225212632.2760126-4-martin.blumenstingl@googlemail.com


Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent 581f7725

drivers/clk/meson/sclk-div.c

+6 −5
Original line number Diff line number Diff line
@@ -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,