From b24f196ca30c0ca4fdc38641ba32d7778f530602 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 1 Jul 2021 18:10:58 -0700 Subject: [PATCH] Revert "clk: divider: Switch from .round_rate to .determine_rate by default" This reverts commit 36daad521a1b945bd05a7f81f968014b94f9e329. 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 Fixes: 36daad521a1b ("clk: divider: Switch from .round_rate to .determine_rate by default") Cc: Jerome Brunet Cc: Martin Blumenstingl Link: https://lore.kernel.org/r/20210702011058.77284-1-sboyd@kernel.org Signed-off-by: Stephen Boyd --- drivers/clk/clk-divider.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 9e05e81116afa..87ba4966b0e81 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); -- 2.39.5