* Re: [PATCH] Revert "clk: divider: Switch from .round_rate to .determine_rate by default"
@ 2021-07-02 4:51 Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2021-07-02 4:51 UTC (permalink / raw)
To: Stephen Boyd
Cc: Michael Turquette, linux-kernel, linux-clk, Jerome Brunet,
Martin Blumenstingl
On Thu, Jul 01, 2021 at 06:10:58PM -0700, Stephen Boyd wrote:
> 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>
> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
> ---
> 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 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);
>
>
> base-commit: 498cc50b3fa99b545532dc433d53d3c0b889cc98
> --
> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
> https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] Revert "clk: divider: Switch from .round_rate to .determine_rate by default"
@ 2021-07-02 1:10 Stephen Boyd
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Boyd @ 2021-07-02 1:10 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd
Cc: linux-kernel, linux-clk, Guenter Roeck, Jerome Brunet,
Martin Blumenstingl
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>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
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 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);
base-commit: 498cc50b3fa99b545532dc433d53d3c0b889cc98
--
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-02 4:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 4:51 [PATCH] Revert "clk: divider: Switch from .round_rate to .determine_rate by default" Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2021-07-02 1:10 Stephen Boyd
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.