diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2014-12-02 02:54:22 -0500 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-12-03 19:21:37 -0500 |
| commit | 646cafc6aa4d6004d189de1cdc267ab562069ba9 (patch) | |
| tree | 6d2f85aecfe37696c0930b1dce17722e863cc804 /include/linux | |
| parent | 61c7cddfad266ebb86176723f9c679f25cf705fe (diff) | |
clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
This is in preparation for clock providers to not have to deal with struct clk.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk-provider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 5e06f23eed41..d936409520f8 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h | |||
| @@ -176,7 +176,7 @@ struct clk_ops { | |||
| 176 | unsigned long *parent_rate); | 176 | unsigned long *parent_rate); |
| 177 | long (*determine_rate)(struct clk_hw *hw, unsigned long rate, | 177 | long (*determine_rate)(struct clk_hw *hw, unsigned long rate, |
| 178 | unsigned long *best_parent_rate, | 178 | unsigned long *best_parent_rate, |
| 179 | struct clk **best_parent_clk); | 179 | struct clk_hw **best_parent_hw); |
| 180 | int (*set_parent)(struct clk_hw *hw, u8 index); | 180 | int (*set_parent)(struct clk_hw *hw, u8 index); |
| 181 | u8 (*get_parent)(struct clk_hw *hw); | 181 | u8 (*get_parent)(struct clk_hw *hw); |
| 182 | int (*set_rate)(struct clk_hw *hw, unsigned long rate, | 182 | int (*set_rate)(struct clk_hw *hw, unsigned long rate, |
| @@ -551,7 +551,7 @@ bool __clk_is_enabled(struct clk *clk); | |||
| 551 | struct clk *__clk_lookup(const char *name); | 551 | struct clk *__clk_lookup(const char *name); |
| 552 | long __clk_mux_determine_rate(struct clk_hw *hw, unsigned long rate, | 552 | long __clk_mux_determine_rate(struct clk_hw *hw, unsigned long rate, |
| 553 | unsigned long *best_parent_rate, | 553 | unsigned long *best_parent_rate, |
| 554 | struct clk **best_parent_p); | 554 | struct clk_hw **best_parent_p); |
| 555 | 555 | ||
| 556 | /* | 556 | /* |
| 557 | * FIXME clock api without lock protection | 557 | * FIXME clock api without lock protection |
