Commit 783d08bd authored by Stephen Boyd's avatar Stephen Boyd

Revert "clk: divider: Switch from .round_rate to .determine_rate by default"

This reverts commit db400ac1. We have
drivers that are still using the .round_rate ops from here. We could
implement both determine_rate and round_rate for 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: default avatarGuenter Roeck <linux@roeck-us.net>
Fixes: db400ac1 ("clk: divider: Switch from .round_rate to .determine_rate by default")
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20210702011058.77284-1-sboyd@kernel.orgSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 498cc50b
...@@ -425,8 +425,8 @@ long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, ...@@ -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); EXPORT_SYMBOL_GPL(divider_ro_round_rate_parent);
static int clk_divider_determine_rate(struct clk_hw *hw, static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
struct clk_rate_request *req) unsigned long *prate)
{ {
struct clk_divider *divider = to_clk_divider(hw); struct clk_divider *divider = to_clk_divider(hw);
...@@ -437,13 +437,13 @@ static int clk_divider_determine_rate(struct clk_hw *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_readl(divider) >> divider->shift;
val &= clk_div_mask(divider->width); val &= clk_div_mask(divider->width);
return divider_ro_determine_rate(hw, req, divider->table, return divider_ro_round_rate(hw, rate, prate, divider->table,
divider->width, divider->width, divider->flags,
divider->flags, val); val);
} }
return divider_determine_rate(hw, req, divider->table, divider->width, return divider_round_rate(hw, rate, prate, divider->table,
divider->flags); divider->width, divider->flags);
} }
int divider_get_val(unsigned long rate, unsigned long parent_rate, 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, ...@@ -500,14 +500,14 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
const struct clk_ops clk_divider_ops = { const struct clk_ops clk_divider_ops = {
.recalc_rate = clk_divider_recalc_rate, .recalc_rate = clk_divider_recalc_rate,
.determine_rate = clk_divider_determine_rate, .round_rate = clk_divider_round_rate,
.set_rate = clk_divider_set_rate, .set_rate = clk_divider_set_rate,
}; };
EXPORT_SYMBOL_GPL(clk_divider_ops); EXPORT_SYMBOL_GPL(clk_divider_ops);
const struct clk_ops clk_divider_ro_ops = { const struct clk_ops clk_divider_ro_ops = {
.recalc_rate = clk_divider_recalc_rate, .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); EXPORT_SYMBOL_GPL(clk_divider_ro_ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment