Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225979
b: refs/heads/master
c: b1d05be
h: refs/heads/master
i:
  225977: b55b94d
  225975: a06f5f7
v: v3
  • Loading branch information
Cyril Chemparathy authored and Kevin Hilman committed Dec 10, 2010
1 parent 5834e71 commit d51afcd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d1c57c84cc474a0fa63aadaa260b13dc5c7d68b
refs/heads/master: b1d05be61f5d29118c2934e684628a5034186825
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-davinci/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,15 +336,15 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate)
ratio--;
}

if (ratio > PLLDIV_RATIO_MASK)
if (ratio > pll->div_ratio_mask)
return -EINVAL;

do {
v = __raw_readl(pll->base + PLLSTAT);
} while (v & PLLSTAT_GOSTAT);

v = __raw_readl(pll->base + clk->div_reg);
v &= ~PLLDIV_RATIO_MASK;
v &= ~pll->div_ratio_mask;
v |= ratio | PLLDIV_EN;
__raw_writel(v, pll->base + clk->div_reg);

Expand Down

0 comments on commit d51afcd

Please sign in to comment.