Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 5eb75f557843132da08938609def2774ee467d95

Authored by Vishwanath BS
Committed by Paul Walmsley
1 parent 0cc9314eaf
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

OMAP3 clock: Remove FreqSel for 3630 

DPLL_FREQSEL field in CLKEN_PLL register is no longer valid for
OMAP3630. So remove references to that.

Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
[paul@pwsan.com: added comment fix from Sergei Shtylyov]
Signed-off-by: Paul Walmsley <paul@pwsan.com>

Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff

arch/arm/mach-omap2/dpll3xxx.c
Diff comments   View file @ 5eb75f5
... ... @@ -243,8 +243,11 @@
243 243 /* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
244 244 _omap3_noncore_dpll_bypass(clk);
245 245  
246   - /* Set jitter correction */
247   - if (!cpu_is_omap44xx()) {
  246 + /*
  247 + * Set jitter correction. No jitter correction for OMAP4 and 3630
  248 + * since freqsel field is no longer present
  249 + */
  250 + if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
248 251 v = __raw_readl(dd->control_reg);
249 252 v &= ~dd->freqsel_mask;
250 253 v |= freqsel << __ffs(dd->freqsel_mask);
... ... @@ -387,8 +390,8 @@
387 390 if (dd->last_rounded_rate == 0)
388 391 return -EINVAL;
389 392  
390   - /* No freqsel on OMAP4 */
391   - if (!cpu_is_omap44xx()) {
  393 + /* No freqsel on OMAP4 and OMAP3630 */
  394 + if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
392 395 freqsel = _omap3_dpll_compute_freqsel(clk,
393 396 dd->last_rounded_n);
394 397 if (!freqsel)