Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81536e07 authored by Shawn Guo's avatar Shawn Guo Committed by Mike Turquette
Browse files

clk: always pass parent_rate into .round_rate 



The parent_rate will likely be used by most .round_rate implementation
no matter whether flag CLK_SET_RATE_PARENT is set or not, so let's
always pass parent_rate into .round_rate.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 27d54591

drivers/clk/clk-divider.c

+3 −9
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate, 
	if (divider->flags & CLK_DIVIDER_ONE_BASED)

		maxdiv--;



	if (!best_parent_rate) {

		parent_rate = __clk_get_rate(__clk_get_parent(hw->clk));

	if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) {

		parent_rate = *best_parent_rate;

		bestdiv = DIV_ROUND_UP(parent_rate, rate);

		bestdiv = bestdiv == 0 ? 1 : bestdiv;

		bestdiv = bestdiv > maxdiv ? maxdiv : bestdiv;
@@ -108,13 +108,7 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, 
	int div;

	div = clk_divider_bestdiv(hw, rate, prate);



	if (prate)

	return *prate / div;

	else {

		unsigned long r;

		r = __clk_get_rate(__clk_get_parent(hw->clk));

		return r / div;

	}

}



static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate)

drivers/clk/clk.c

+7 −9
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ EXPORT_SYMBOL_GPL(clk_get_rate); 
 */

unsigned long __clk_round_rate(struct clk *clk, unsigned long rate)

{

	unsigned long unused;

	unsigned long parent_rate = 0;



	if (!clk)

		return -EINVAL;
@@ -590,10 +590,10 @@ unsigned long __clk_round_rate(struct clk *clk, unsigned long rate) 
	if (!clk->ops->round_rate)

		return clk->rate;



	if (clk->flags & CLK_SET_RATE_PARENT)

		return clk->ops->round_rate(clk->hw, rate, &unused);

	else

		return clk->ops->round_rate(clk->hw, rate, NULL);

	if (clk->parent)

		parent_rate = clk->parent->rate;



	return clk->ops->round_rate(clk->hw, rate, &parent_rate);

}



/**
@@ -763,7 +763,7 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate) 
static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate)

{

	struct clk *top = clk;

	unsigned long best_parent_rate;

	unsigned long best_parent_rate = 0;

	unsigned long new_rate;



	/* sanity */
@@ -775,9 +775,6 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate) 
		if (!clk->ops->round_rate) {

			clk->new_rate = clk->rate;

			return NULL;

		} else {

			new_rate = clk->ops->round_rate(clk->hw, rate, NULL);

			goto out;

		}

	}
@@ -794,6 +791,7 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate) 
		goto out;

	}



	best_parent_rate = clk->parent->rate;

	new_rate = clk->ops->round_rate(clk->hw, rate, &best_parent_rate);



	if (best_parent_rate != clk->parent->rate) {