Skip to content

Commit 5eb75f5

Browse files
vishwabsPaul Walmsley
authored andcommitted
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 <[email protected]> Cc: Sergei Shtylyov <[email protected]> [[email protected]: added comment fix from Sergei Shtylyov] Signed-off-by: Paul Walmsley <[email protected]>
1 parent 0cc9314 commit 5eb75f5

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

arch/arm/mach-omap2/dpll3xxx.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,11 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel)
243243
/* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
244244
_omap3_noncore_dpll_bypass(clk);
245245

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()) {
248251
v = __raw_readl(dd->control_reg);
249252
v &= ~dd->freqsel_mask;
250253
v |= freqsel << __ffs(dd->freqsel_mask);
@@ -387,8 +390,8 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
387390
if (dd->last_rounded_rate == 0)
388391
return -EINVAL;
389392

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()) {
392395
freqsel = _omap3_dpll_compute_freqsel(clk,
393396
dd->last_rounded_n);
394397
if (!freqsel)

0 commit comments

Comments
 (0)