Skip to content

Commit

Permalink
clk: pxa: core pll is not affected by t bit
Browse files Browse the repository at this point in the history
The t bit of clkfcfg doesn't affect the core pll clock, but it makes core
clock select between core pll clock and core run clock.

As such remove it from the core pll rate reporting function, while it
remains in clk_pxa27x_core_get_parent().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  • Loading branch information
rjarzmik authored and bebarino committed Nov 2, 2016
1 parent 06b8ec4 commit 26bd423
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions drivers/clk/pxa/clk-pxa25x.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ static unsigned long clk_pxa25x_cpll_get_rate(struct clk_hw *hw,
m = M_clk_mult[(cccr >> 5) & 0x03];
n2 = N2_clk_mult[(cccr >> 7) & 0x07];

if (t)
return m * l * n2 * parent_rate / 2;
return m * l * parent_rate;
return m * l * n2 * parent_rate / 2;
}
PARENTS(clk_pxa25x_cpll) = { "osc_3_6864mhz" };
RATE_RO_OPS(clk_pxa25x_cpll, "cpll");
Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/pxa/clk-pxa27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static unsigned long clk_pxa27x_cpll_get_rate(struct clk_hw *hw,
L = l * parent_rate;
N = (L * n2) / 2;

return t ? N : L;
return N;
}
PARENTS(clk_pxa27x_cpll) = { "osc_13mhz" };
RATE_RO_OPS(clk_pxa27x_cpll, "cpll");
Expand Down

0 comments on commit 26bd423

Please sign in to comment.