Commit 643761ac authored by Russell King's avatar Russell King
Browse files

ARM: ICST: icst.*_ps_to_vco() functions are unused, remove them 



These functions were originally implemented for the CLCD driver before
we had clk API support.  Since the CLCD driver does not use these
anymore, we can remove them.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 39c0cb02

arch/arm/common/icst307.c

+0 −64
Original line number Diff line number Diff line
@@ -95,67 +95,3 @@ icst307_khz_to_vco(const struct icst_params *p, unsigned long freq) 
}



EXPORT_SYMBOL(icst307_khz_to_vco);
 


struct icst_vco

icst307_ps_to_vco(const struct icst_params *p, unsigned long period)

{

	struct icst_vco vco = { .s = 1, .v = p->vd_max, .r = p->rd_max };

	unsigned long f, ps;

	unsigned int i = 0, rd, best = (unsigned int)-1;



	ps = 1000000000UL / p->vco_max;



	/*

	 * First, find the PLL output divisor such

	 * that the PLL output is within spec.

	 */

	do {

		f = period / s2div[idx2s[i]];



		/*

		 * f must be between 6MHz and 200MHz (3.3 or 5V)

		 */

		if (f >= ps && f < 1000000000UL / 6000 + 1)

			break;

	} while (i < ARRAY_SIZE(idx2s));



	if (i >= ARRAY_SIZE(idx2s))

		return vco;



	vco.s = idx2s[i];



	ps = 500000000UL / p->ref;



	/*

	 * Now find the closest divisor combination

	 * which gives a PLL output of 'f'.

	 */

	for (rd = p->rd_min; rd <= p->rd_max; rd++) {

		unsigned long f_in_div, f_pll;

		unsigned int vd;

		int f_diff;



		f_in_div = ps * rd;



		vd = (f_in_div + f / 2) / f;

		if (vd < p->vd_min || vd > p->vd_max)

			continue;



		f_pll = (f_in_div + vd / 2) / vd;

		f_diff = f_pll - f;

		if (f_diff < 0)

			f_diff = -f_diff;



		if ((unsigned)f_diff < best) {

			vco.v = vd - 8;

			vco.r = rd - 2;

			if (f_diff == 0)

				break;

			best = f_diff;

		}

	}



	return vco;

}



EXPORT_SYMBOL(icst307_ps_to_vco);

arch/arm/common/icst525.c

+0 −65
Original line number Diff line number Diff line
@@ -93,68 +93,3 @@ icst525_khz_to_vco(const struct icst_params *p, unsigned long freq) 
}



EXPORT_SYMBOL(icst525_khz_to_vco);
 


struct icst_vco

icst525_ps_to_vco(const struct icst_params *p, unsigned long period)

{

	struct icst_vco vco = { .s = 1, .v = p->vd_max, .r = p->rd_max };

	unsigned long f, ps;

	unsigned int i = 0, rd, best = (unsigned int)-1;



	ps = 1000000000UL / p->vco_max;



	/*

	 * First, find the PLL output divisor such

	 * that the PLL output is within spec.

	 */

	do {

		f = period / s2div[idx2s[i]];



		/*

		 * f must be between 10MHz and

		 *  320MHz (5V) or 200MHz (3V)

		 */

		if (f >= ps && f < 100000)

			break;

	} while (i < ARRAY_SIZE(idx2s));



	if (i >= ARRAY_SIZE(idx2s))

		return vco;



	vco.s = idx2s[i];



	ps = 500000000UL / p->ref;



	/*

	 * Now find the closest divisor combination

	 * which gives a PLL output of 'f'.

	 */

	for (rd = p->rd_min; rd <= p->rd_max; rd++) {

		unsigned long f_in_div, f_pll;

		unsigned int vd;

		int f_diff;



		f_in_div = ps * rd;



		vd = (f_in_div + f / 2) / f;

		if (vd < p->vd_min || vd > p->vd_max)

			continue;



		f_pll = (f_in_div + vd / 2) / vd;

		f_diff = f_pll - f;

		if (f_diff < 0)

			f_diff = -f_diff;



		if ((unsigned)f_diff < best) {

			vco.v = vd - 8;

			vco.r = rd - 2;

			if (f_diff == 0)

				break;

			best = f_diff;

		}

	}



	return vco;

}



EXPORT_SYMBOL(icst525_ps_to_vco);

arch/arm/include/asm/hardware/icst307.h

+0 −1
Original line number Diff line number Diff line
@@ -20,6 +20,5 @@ 


unsigned long icst307_khz(const struct icst_params *p, struct icst_vco vco);

struct icst_vco icst307_khz_to_vco(const struct icst_params *p, unsigned long freq);

struct icst_vco icst307_ps_to_vco(const struct icst_params *p, unsigned long period);



#endif

arch/arm/include/asm/hardware/icst525.h

+0 −1
Original line number Diff line number Diff line
@@ -18,6 +18,5 @@ 


unsigned long icst525_khz(const struct icst_params *p, struct icst_vco vco);

struct icst_vco icst525_khz_to_vco(const struct icst_params *p, unsigned long freq);

struct icst_vco icst525_ps_to_vco(const struct icst_params *p, unsigned long period);



#endif