Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eb75f55 authored by Vishwanath BS's avatar Vishwanath BS Committed by Paul Walmsley
Browse files

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: default avatarVishwanath BS <vishwanath.bs@ti.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
[paul@pwsan.com: added comment fix from Sergei Shtylyov]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 0cc9314e

arch/arm/mach-omap2/dpll3xxx.c

+7 −4
Original line number Diff line number Diff line
@@ -243,8 +243,11 @@ 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 */

	if (!cpu_is_omap44xx()) {

	/*

	 * Set jitter correction. No jitter correction for OMAP4 and 3630

	 * since freqsel field is no longer present

	 */

	if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {

		v = __raw_readl(dd->control_reg);

		v &= ~dd->freqsel_mask;

		v |= freqsel << __ffs(dd->freqsel_mask);
@@ -387,8 +390,8 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) 
		if (dd->last_rounded_rate == 0)

			return -EINVAL;



		/* No freqsel on OMAP4 */

		if (!cpu_is_omap44xx()) {

		/* No freqsel on OMAP4 and OMAP3630 */

		if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {

			freqsel = _omap3_dpll_compute_freqsel(clk,

						dd->last_rounded_n);

			if (!freqsel)