diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2021-07-01 18:10:58 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2021-07-01 18:12:59 -0700 |
| commit | 783d08bd02f5d33d6e9e7fea62b727e2b6fe6462 (patch) | |
| tree | cc67b6016f4c53b8642dade847e1ef37f1806c07 /drivers/clk/clk-divider.c | |
| parent | 498cc50b3fa99b545532dc433d53d3c0b889cc98 (diff) | |
Revert "clk: divider: Switch from .round_rate to .determine_rate by default"
This reverts commit db400ac1444b756030249ed4a35e53a68e557b59. 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: Guenter Roeck <linux@roeck-us.net>
Fixes: db400ac1444b ("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.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/clk-divider.c')
| -rw-r--r-- | drivers/clk/clk-divider.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 9e05e81116af..87ba4966b0e8 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -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); |