diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-02-02 17:59:38 -0500 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-02-02 17:59:38 -0500 |
| commit | 54eea32f7ed3037c91853924227585b65df909a8 (patch) | |
| tree | 4e3e9ece8a66f611e980ddc503ca7184db8f83fb /arch/mips | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| parent | b530e7d2108a871279dcf707d9d15a3358767d2b (diff) | |
Merge branch 'clk-next' into v3.19-rc7
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/alchemy/common/clock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c index 48a9dfc55b51..4e65404b3ba3 100644 --- a/arch/mips/alchemy/common/clock.c +++ b/arch/mips/alchemy/common/clock.c | |||
| @@ -373,6 +373,8 @@ static long alchemy_calc_div(unsigned long rate, unsigned long prate, | |||
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate, | 375 | static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate, |
| 376 | unsigned long min_rate, | ||
| 377 | unsigned long max_rate, | ||
| 376 | unsigned long *best_parent_rate, | 378 | unsigned long *best_parent_rate, |
| 377 | struct clk_hw **best_parent_clk, | 379 | struct clk_hw **best_parent_clk, |
| 378 | int scale, int maxdiv) | 380 | int scale, int maxdiv) |
| @@ -546,6 +548,8 @@ static unsigned long alchemy_clk_fgv1_recalc(struct clk_hw *hw, | |||
| 546 | } | 548 | } |
| 547 | 549 | ||
| 548 | static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate, | 550 | static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate, |
| 551 | unsigned long min_rate, | ||
| 552 | unsigned long max_rate, | ||
| 549 | unsigned long *best_parent_rate, | 553 | unsigned long *best_parent_rate, |
| 550 | struct clk_hw **best_parent_clk) | 554 | struct clk_hw **best_parent_clk) |
| 551 | { | 555 | { |
| @@ -678,6 +682,8 @@ static unsigned long alchemy_clk_fgv2_recalc(struct clk_hw *hw, | |||
| 678 | } | 682 | } |
| 679 | 683 | ||
| 680 | static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate, | 684 | static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate, |
| 685 | unsigned long min_rate, | ||
| 686 | unsigned long max_rate, | ||
| 681 | unsigned long *best_parent_rate, | 687 | unsigned long *best_parent_rate, |
| 682 | struct clk_hw **best_parent_clk) | 688 | struct clk_hw **best_parent_clk) |
| 683 | { | 689 | { |
| @@ -897,6 +903,8 @@ static int alchemy_clk_csrc_setr(struct clk_hw *hw, unsigned long rate, | |||
| 897 | } | 903 | } |
| 898 | 904 | ||
| 899 | static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate, | 905 | static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate, |
| 906 | unsigned long min_rate, | ||
| 907 | unsigned long max_rate, | ||
| 900 | unsigned long *best_parent_rate, | 908 | unsigned long *best_parent_rate, |
| 901 | struct clk_hw **best_parent_clk) | 909 | struct clk_hw **best_parent_clk) |
| 902 | { | 910 | { |