diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 20:51:30 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 20:51:30 +0200 |
commit | 19aab273083fa10c2262b8c8e3315bacb054d75d (patch) | |
tree | 65097982915b51acdf8d5576d63153085b779ceb /Documentation | |
parent | clk: st: Fix error paths and allocation style (diff) | |
parent | clk: fix some determine_rate implementations (diff) | |
download | linux-19aab273083fa10c2262b8c8e3315bacb054d75d.tar.xz linux-19aab273083fa10c2262b8c8e3315bacb054d75d.zip |
Merge branch 'clk-determine-rate-struct' into clk-next
* clk-determine-rate-struct:
clk: fix some determine_rate implementations
clk: change clk_ops' ->determine_rate() prototype
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/clk.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/clk.txt b/Documentation/clk.txt index f463bdc37f88..5c4bc4d01d0c 100644 --- a/Documentation/clk.txt +++ b/Documentation/clk.txt @@ -71,12 +71,8 @@ the operations defined in clk.h: long (*round_rate)(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate); - long (*determine_rate)(struct clk_hw *hw, - unsigned long rate, - unsigned long min_rate, - unsigned long max_rate, - unsigned long *best_parent_rate, - struct clk_hw **best_parent_clk); + int (*determine_rate)(struct clk_hw *hw, + struct clk_rate_request *req); int (*set_parent)(struct clk_hw *hw, u8 index); u8 (*get_parent)(struct clk_hw *hw); int (*set_rate)(struct clk_hw *hw, |