Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137334
b: refs/heads/master
c: f0587b6
h: refs/heads/master
v: v3
  • Loading branch information
Paul Walmsley authored and Russell King committed Feb 8, 2009
1 parent 8d50700 commit 039801d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 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: f266950d0234599cc6d4a5602e43d0fb782de1d2
refs/heads/master: f0587b63c24e0c7539c6e77f1bfc68e6053608c7
13 changes: 8 additions & 5 deletions trunk/arch/arm/mach-omap2/clock34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,14 +563,17 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel)
/* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
_omap3_noncore_dpll_bypass(clk);

/* Set jitter correction */
v = __raw_readl(dd->control_reg);
v &= ~dd->freqsel_mask;
v |= freqsel << __ffs(dd->freqsel_mask);
__raw_writel(v, dd->control_reg);

/* Set DPLL multiplier, divider */
v = __raw_readl(dd->mult_div1_reg);
v &= ~(dd->mult_mask | dd->div1_mask);

/* Set mult (M), div1 (N), freqsel */
v |= m << __ffs(dd->mult_mask);
v |= n << __ffs(dd->div1_mask);
v |= freqsel << __ffs(dd->freqsel_mask);

v |= (n - 1) << __ffs(dd->div1_mask);
__raw_writel(v, dd->mult_div1_reg);

/* We let the clock framework set the other output dividers later */
Expand Down

0 comments on commit 039801d

Please sign in to comment.