Revert "clk: divider: Switch from .round_rate to .determine_rate by default"
Quoted 11 lines · Stephen Boyd
This reverts commit
db400ac1444b756030249ed4a35e53a68e557b59. We have drivers that are still using the .round_rate ops from here. We could implement bothdetermine_rateandround_ratefor these divider ops, but for now let's just kick out the commit that tried to change it and convert various drivers properly.Reported-by Guenter Roeck <[email protected]>Fixes db400ac1444b ("clk: divider: Switch from .round_rate to .determine_rate by default")Cc Jerome Brunet <[email protected]>Cc Martin Blumenstingl <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Acked-by Guenter Roeck <[email protected]>
Tested-by Guenter Roeck <[email protected]>
Quoted 61 lines
--- drivers/clk/clk-divider.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/clk/clk-divider.c +9
-9@@ -425,8 +425,8 @@ long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, }EXPORT_SYMBOL_GPL (divider_ro_round_rate_parent); -static int clk_divider_determine_rate (struct clk_hw *hw, -struct clk_rate_request *req) +static long clk_divider_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) {struct clk_divider *divider =to_clk_divider (hw);@@ -437,13 +437,13 @@ static int clk_divider_determine_rate(struct clk_hw *hw, val =clk_div_readl (divider) >> divider->shift; val &=clk_div_mask (divider->width); -return divider_ro_determine_rate (hw, req, divider->table, - divider->width, - divider->flags, val); +return divider_ro_round_rate (hw, rate, prate, divider->table, + divider->width, divider->flags, + val); } -return divider_determine_rate (hw, req, divider->table, divider->width, - divider->flags); +return divider_round_rate (hw, rate, prate, divider->table, + divider->width, divider->flags); } int divider_get_val(unsigned long rate, unsigned long parent_rate,@@ -500,14 +500,14 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,const struct clk_ops clk_divider_ops = { .recalc_rate = clk_divider_recalc_rate, - .determine_rate = clk_divider_determine_rate, + .round_rate = clk_divider_round_rate, .set_rate = clk_divider_set_rate, };EXPORT_SYMBOL_GPL (clk_divider_ops);const struct clk_ops clk_divider_ro_ops = { .recalc_rate = clk_divider_recalc_rate, - .determine_rate = clk_divider_determine_rate, + .round_rate = clk_divider_round_rate, };EXPORT_SYMBOL_GPL (clk_divider_ro_ops);base-commit:
498cc50b3fa99b545532dc433d53d3c0b889cc98Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git