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

Commit 1194d7b8 authored by Jon Hunter's avatar Jon Hunter Committed by Paul Walmsley
Browse files

ARM: OMAP3+: Update DPLL Fint range for OMAP36xx and OMAP4xxx devices 



The OMAP36xx and OMAP4xxx DPLLs have a different internal reference
clock frequency (fint) operating range than OMAP3430. Update the
dpll_test_fint() function to check for the correct frequency ranges
for OMAP36xx and OMAP4xxx.

For OMAP36xx and OMAP4xxx devices, DPLLs fint range is 0.5MHz to
2.5MHz for j-type DPLLs and otherwise it is 32KHz to 52MHz for all
other DPLLs.

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent cf2a82d7

arch/arm/mach-omap2/clkt_dpll.c

+35 −16
Original line number Diff line number Diff line
@@ -46,10 +46,19 @@ 
					 (DPLL_SCALE_FACTOR / DPLL_SCALE_BASE))



/* DPLL valid Fint frequency band limits - from 34xx TRM Section 4.7.6.2 */

#define DPLL_FINT_BAND1_MIN		750000

#define DPLL_FINT_BAND1_MAX		2100000

#define DPLL_FINT_BAND2_MIN		7500000

#define DPLL_FINT_BAND2_MAX		21000000

#define OMAP3430_DPLL_FINT_BAND1_MIN	750000

#define OMAP3430_DPLL_FINT_BAND1_MAX	2100000

#define OMAP3430_DPLL_FINT_BAND2_MIN	7500000

#define OMAP3430_DPLL_FINT_BAND2_MAX	21000000



/*

 * DPLL valid Fint frequency range for OMAP36xx and OMAP4xxx.

 * From device data manual section 4.3 "DPLL and DLL Specifications".

 */

#define OMAP3PLUS_DPLL_FINT_JTYPE_MIN	500000

#define OMAP3PLUS_DPLL_FINT_JTYPE_MAX	2500000

#define OMAP3PLUS_DPLL_FINT_MIN		32000

#define OMAP3PLUS_DPLL_FINT_MAX		52000000



/* _dpll_test_fint() return codes */

#define DPLL_FINT_UNDERFLOW		-1
@@ -71,33 +80,43 @@ 
static int _dpll_test_fint(struct clk *clk, u8 n)

{

	struct dpll_data *dd;

	long fint;

	long fint, fint_min, fint_max;

	int ret = 0;



	dd = clk->dpll_data;



	/* DPLL divider must result in a valid jitter correction val */

	fint = clk->parent->rate / n;

	if (fint < DPLL_FINT_BAND1_MIN) {



	if (cpu_is_omap24xx()) {

		/* Should not be called for OMAP2, so warn if it is called */

		WARN(1, "No fint limits available for OMAP2!\n");

		return DPLL_FINT_INVALID;

	} else if (cpu_is_omap3430()) {

		fint_min = OMAP3430_DPLL_FINT_BAND1_MIN;

		fint_max = OMAP3430_DPLL_FINT_BAND2_MAX;

	} else if (dd->flags & DPLL_J_TYPE) {

		fint_min = OMAP3PLUS_DPLL_FINT_JTYPE_MIN;

		fint_max = OMAP3PLUS_DPLL_FINT_JTYPE_MAX;

	} else {

		fint_min = OMAP3PLUS_DPLL_FINT_MIN;

		fint_max = OMAP3PLUS_DPLL_FINT_MAX;

	}



	if (fint < fint_min) {

		pr_debug("rejecting n=%d due to Fint failure, "

			 "lowering max_divider\n", n);

		dd->max_divider = n;

		ret = DPLL_FINT_UNDERFLOW;



	} else if (fint > DPLL_FINT_BAND1_MAX &&

		   fint < DPLL_FINT_BAND2_MIN) {



		pr_debug("rejecting n=%d due to Fint failure\n", n);

		ret = DPLL_FINT_INVALID;



	} else if (fint > DPLL_FINT_BAND2_MAX) {



	} else if (fint > fint_max) {

		pr_debug("rejecting n=%d due to Fint failure, "

			 "boosting min_divider\n", n);

		dd->min_divider = n;

		ret = DPLL_FINT_INVALID;



	} else if (cpu_is_omap3430() && fint > OMAP3430_DPLL_FINT_BAND1_MAX &&

		   fint < OMAP3430_DPLL_FINT_BAND2_MIN) {

		pr_debug("rejecting n=%d due to Fint failure\n", n);

		ret = DPLL_FINT_INVALID;

	}



	return ret;