| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Jerome Brunet <jbrunet@baylibre.com> |
| Date: Mon, 9 Apr 2018 15:59:20 +0200 |
| Subject: clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux |
| |
| From: Jerome Brunet <jbrunet@baylibre.com> |
| |
| [ Upstream commit 4ad69b80e886a845f56ce0a3d10211208693d92b ] |
| |
| CLK_MUX_ROUND_CLOSEST is part of the clk_mux documentation but clk_mux |
| directly calls __clk_mux_determine_rate(), which overrides the flag. |
| As result, if clk_mux is instantiated with CLK_MUX_ROUND_CLOSEST, the |
| flag will be ignored and the clock rounded down. |
| |
| To solve this, this patch expose clk_mux_determine_rate_flags() in the |
| clk-provider API and uses it in the determine_rate() callback of clk_mux. |
| |
| Fixes: 15a02c1f6dd7 ("clk: Add __clk_mux_determine_rate_closest") |
| Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> |
| Signed-off-by: Stephen Boyd <sboyd@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/clk/clk-mux.c | 10 +++++++++- |
| drivers/clk/clk.c | 7 ++++--- |
| include/linux/clk-provider.h | 3 +++ |
| 3 files changed, 16 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/clk/clk-mux.c |
| +++ b/drivers/clk/clk-mux.c |
| @@ -101,10 +101,18 @@ static int clk_mux_set_parent(struct clk |
| return 0; |
| } |
| |
| +static int clk_mux_determine_rate(struct clk_hw *hw, |
| + struct clk_rate_request *req) |
| +{ |
| + struct clk_mux *mux = to_clk_mux(hw); |
| + |
| + return clk_mux_determine_rate_flags(hw, req, mux->flags); |
| +} |
| + |
| const struct clk_ops clk_mux_ops = { |
| .get_parent = clk_mux_get_parent, |
| .set_parent = clk_mux_set_parent, |
| - .determine_rate = __clk_mux_determine_rate, |
| + .determine_rate = clk_mux_determine_rate, |
| }; |
| EXPORT_SYMBOL_GPL(clk_mux_ops); |
| |
| --- a/drivers/clk/clk.c |
| +++ b/drivers/clk/clk.c |
| @@ -426,9 +426,9 @@ static bool mux_is_better_rate(unsigned |
| return now <= rate && now > best; |
| } |
| |
| -static int |
| -clk_mux_determine_rate_flags(struct clk_hw *hw, struct clk_rate_request *req, |
| - unsigned long flags) |
| +int clk_mux_determine_rate_flags(struct clk_hw *hw, |
| + struct clk_rate_request *req, |
| + unsigned long flags) |
| { |
| struct clk_core *core = hw->core, *parent, *best_parent = NULL; |
| int i, num_parents, ret; |
| @@ -488,6 +488,7 @@ out: |
| |
| return 0; |
| } |
| +EXPORT_SYMBOL_GPL(clk_mux_determine_rate_flags); |
| |
| struct clk *__clk_lookup(const char *name) |
| { |
| --- a/include/linux/clk-provider.h |
| +++ b/include/linux/clk-provider.h |
| @@ -755,6 +755,9 @@ int __clk_mux_determine_rate(struct clk_ |
| int __clk_determine_rate(struct clk_hw *core, struct clk_rate_request *req); |
| int __clk_mux_determine_rate_closest(struct clk_hw *hw, |
| struct clk_rate_request *req); |
| +int clk_mux_determine_rate_flags(struct clk_hw *hw, |
| + struct clk_rate_request *req, |
| + unsigned long flags); |
| void clk_hw_reparent(struct clk_hw *hw, struct clk_hw *new_parent); |
| void clk_hw_set_rate_range(struct clk_hw *hw, unsigned long min_rate, |
| unsigned long max_rate); |