diff options
| author | Jerome Brunet | 2018-04-09 15:59:20 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2018-04-16 18:25:07 +0200 |
| commit | 4ad69b80e886a845f56ce0a3d10211208693d92b (patch) | |
| tree | 933b4da9d4ed5ac997d38b6afa88a11c1b568285 /drivers/clk/clk.c | |
| parent | clk: cs2000: mark resume function as __maybe_unused (diff) | |
| download | kernel-qcow2-linux-4ad69b80e886a845f56ce0a3d10211208693d92b.tar.gz kernel-qcow2-linux-4ad69b80e886a845f56ce0a3d10211208693d92b.tar.xz kernel-qcow2-linux-4ad69b80e886a845f56ce0a3d10211208693d92b.zip | |
clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux
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>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index ea67ac81c6f9..7af555f0e60c 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -426,9 +426,9 @@ static bool mux_is_better_rate(unsigned long rate, unsigned long now, 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) { |