mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

MIPS: alchemy: Convert to clk_hw based provider APIs

Browse source 
We're removing struct clk from the clk provider API, so switch
this code to using the clk_hw based provider APIs.

Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Stephen Boyd 2015-07-30 17:20:57 -07:00 committed by Michael Turquette
parent 7819189779
commit 617b8272a6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/mips/alchemy/common/clock.c
View file

@ -394,7 +394,7 @@ static int alchemy_clk_fgcs_detr(struct clk_hw *hw,
struct clk_rate_request *req,
int scale, int maxdiv)
{
struct clk *pc, *bpc, *free;
struct clk_hw *pc, *bpc, *free;
long tdv, tpr, pr, nr, br, bpr, diff, lastdiff;
int j;
@ -408,7 +408,7 @@ static int alchemy_clk_fgcs_detr(struct clk_hw *hw,
* the one that gets closest to but not over the requested rate.
*/
for (j = 0; j < 7; j++) {
pc = clk_get_parent_by_index(hw->clk, j);
pc = clk_hw_get_parent_by_index(hw, j);
if (!pc)
break;
@ -416,12 +416,12 @@ static int alchemy_clk_fgcs_detr(struct clk_hw *hw,
* XXX: we would actually want clk_has_active_children()
* but this is a good-enough approximation for now.
*/
if (!__clk_is_prepared(pc)) {
if (!clk_hw_is_prepared(pc)) {
if (!free)
free = pc;
}
pr = clk_get_rate(pc);
pr = clk_hw_get_rate(pc);
if (pr < req->rate)
continue;
@ -451,7 +451,7 @@ static int alchemy_clk_fgcs_detr(struct clk_hw *hw,
tpr = req->rate * j;
if (tpr < 0)
break;
pr = clk_round_rate(free, tpr);
pr = clk_hw_round_rate(free, tpr);
tdv = alchemy_calc_div(req->rate, pr, scale, maxdiv,
NULL);
@ -474,7 +474,7 @@ static int alchemy_clk_fgcs_detr(struct clk_hw *hw,
return br;
req->best_parent_rate = bpr;
req->best_parent_hw = __clk_get_hw(bpc);
req->best_parent_hw = bpc;
req->rate = br;
return 0;