diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
| commit | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (patch) | |
| tree | a9655fcdd65c2068cc04ffe3562a9c710dfa2145 /include/linux/clk-provider.h | |
| parent | b0e4376b34cab1cbbd7ed399a1df787890336837 (diff) | |
| parent | a26899e0baa4de07caf97f5e4d7298240e98fd0e (diff) | |
Merge tag 'v4.14.52' into linux-linaro-lsk-v4.14lsk-v4.14-18.06
This is the 4.14.52 stable release
Diffstat (limited to 'include/linux/clk-provider.h')
| -rw-r--r-- | include/linux/clk-provider.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 86eb33f67618..2f4e79fe7b86 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -752,6 +752,9 @@ int __clk_mux_determine_rate(struct clk_hw *hw, 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); |