aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/alchemy/common/clock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c
index 203e4403c366..48a9dfc55b51 100644
--- a/arch/mips/alchemy/common/clock.c
+++ b/arch/mips/alchemy/common/clock.c
@@ -374,7 +374,7 @@ static long alchemy_calc_div(unsigned long rate, unsigned long prate,
374 374
375static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate, 375static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate,
376 unsigned long *best_parent_rate, 376 unsigned long *best_parent_rate,
377 struct clk **best_parent_clk, 377 struct clk_hw **best_parent_clk,
378 int scale, int maxdiv) 378 int scale, int maxdiv)
379{ 379{
380 struct clk *pc, *bpc, *free; 380 struct clk *pc, *bpc, *free;
@@ -453,7 +453,7 @@ static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate,
453 } 453 }
454 454
455 *best_parent_rate = bpr; 455 *best_parent_rate = bpr;
456 *best_parent_clk = bpc; 456 *best_parent_clk = __clk_get_hw(bpc);
457 return br; 457 return br;
458} 458}
459 459
@@ -547,7 +547,7 @@ static unsigned long alchemy_clk_fgv1_recalc(struct clk_hw *hw,
547 547
548static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate, 548static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate,
549 unsigned long *best_parent_rate, 549 unsigned long *best_parent_rate,
550 struct clk **best_parent_clk) 550 struct clk_hw **best_parent_clk)
551{ 551{
552 return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate, 552 return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate,
553 best_parent_clk, 2, 512); 553 best_parent_clk, 2, 512);
@@ -679,7 +679,7 @@ static unsigned long alchemy_clk_fgv2_recalc(struct clk_hw *hw,
679 679
680static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate, 680static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate,
681 unsigned long *best_parent_rate, 681 unsigned long *best_parent_rate,
682 struct clk **best_parent_clk) 682 struct clk_hw **best_parent_clk)
683{ 683{
684 struct alchemy_fgcs_clk *c = to_fgcs_clk(hw); 684 struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
685 int scale, maxdiv; 685 int scale, maxdiv;
@@ -898,7 +898,7 @@ static int alchemy_clk_csrc_setr(struct clk_hw *hw, unsigned long rate,
898 898
899static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate, 899static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate,
900 unsigned long *best_parent_rate, 900 unsigned long *best_parent_rate,
901 struct clk **best_parent_clk) 901 struct clk_hw **best_parent_clk)
902{ 902{
903 struct alchemy_fgcs_clk *c = to_fgcs_clk(hw); 903 struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
904 int scale = c->dt[2] == 3 ? 1 : 2; /* au1300 check */ 904 int scale = c->dt[2] == 3 ? 1 : 2; /* au1300 check */