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

Commit 232eaf7f authored by Russell King's avatar Russell King
Browse files

ARM: ICST: indirect s2div and idx2s arrays via icst_params 



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

arch/arm/common/icst307.c

+11 −7
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ 
/*

 * Divisors for each OD setting.

 */

static unsigned char s2div[8] = { 10, 2, 8, 4, 5, 7, 3, 6 };

const unsigned char icst307_s2div[8] = { 10, 2, 8, 4, 5, 7, 3, 6 };



EXPORT_SYMBOL(icst307_s2div);



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

{

	return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * s2div[vco.s]);

	return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * p->s2div[vco.s]);

}



EXPORT_SYMBOL(icst307_hz);
@@ -34,7 +36,9 @@ EXPORT_SYMBOL(icst307_hz); 
/*

 * Ascending divisor S values.

 */

static unsigned char idx2s[8] = { 1, 6, 3, 4, 7, 5, 2, 0 };

const unsigned char icst307_idx2s[8] = { 1, 6, 3, 4, 7, 5, 2, 0 };



EXPORT_SYMBOL(icst307_idx2s);



struct icst_vco

icst307_hz_to_vco(const struct icst_params *p, unsigned long freq)
@@ -48,19 +52,19 @@ icst307_hz_to_vco(const struct icst_params *p, unsigned long freq) 
	 * that the PLL output is within spec.

	 */

	do {

		f = freq * s2div[idx2s[i]];

		f = freq * p->s2div[p->idx2s[i]];



		/*

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

		 */

		if (f > p->vco_min && f <= p->vco_max)

			break;

	} while (i < ARRAY_SIZE(idx2s));

	} while (i < 8);



	if (i >= ARRAY_SIZE(idx2s))

	if (i >= 8)

		return vco;



	vco.s = idx2s[i];

	vco.s = p->idx2s[i];



	/*

	 * Now find the closest divisor combination

arch/arm/common/icst525.c

+11 −7
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ 
/*

 * Divisors for each OD setting.

 */

static unsigned char s2div[8] = { 10, 2, 8, 4, 5, 7, 9, 6 };

const unsigned char icst525_s2div[8] = { 10, 2, 8, 4, 5, 7, 9, 6 };



EXPORT_SYMBOL(icst525_s2div);



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

{

	return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * s2div[vco.s]);

	return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * p->s2div[vco.s]);

}



EXPORT_SYMBOL(icst525_hz);
@@ -31,7 +33,9 @@ EXPORT_SYMBOL(icst525_hz); 
/*

 * Ascending divisor S values.

 */

static unsigned char idx2s[] = { 1, 3, 4, 7, 5, 2, 6, 0 };

const unsigned char icst525_idx2s[8] = { 1, 3, 4, 7, 5, 2, 6, 0 };



EXPORT_SYMBOL(icst525_idx2s);



struct icst_vco

icst525_hz_to_vco(const struct icst_params *p, unsigned long freq)
@@ -45,7 +49,7 @@ icst525_hz_to_vco(const struct icst_params *p, unsigned long freq) 
	 * that the PLL output is within spec.

	 */

	do {

		f = freq * s2div[idx2s[i]];

		f = freq * p->s2div[p->idx2s[i]];



		/*

		 * f must be between 10MHz and
@@ -53,12 +57,12 @@ icst525_hz_to_vco(const struct icst_params *p, unsigned long freq) 
		 */

		if (f > p->vco_min && f <= p->vco_max)

			break;

	} while (i < ARRAY_SIZE(idx2s));

	} while (i < 8);



	if (i >= ARRAY_SIZE(idx2s))

	if (i >= 8)

		return vco;



	vco.s = idx2s[i];

	vco.s = p->idx2s[i];



	/*

	 * Now find the closest divisor combination

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ struct icst_params { 
	unsigned short	vd_max;		/* inclusive */

	unsigned char	rd_min;		/* inclusive */

	unsigned char	rd_max;		/* inclusive */

	const unsigned char *s2div;	/* chip specific s2div array */

	const unsigned char *idx2s;	/* chip specific idx2s array */

};



struct icst_vco {

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

+3 −0
Original line number Diff line number Diff line
@@ -28,4 +28,7 @@ struct icst_vco icst307_hz_to_vco(const struct icst_params *p, unsigned long fre 
#define ICST307_VCO_MIN	6000000

#define ICST307_VCO_MAX	200000000



extern const unsigned char icst307_s2div[];

extern const unsigned char icst307_idx2s[];



#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -27,4 +27,7 @@ struct icst_vco icst525_hz_to_vco(const struct icst_params *p, unsigned long fre 
#define ICST525_VCO_MAX_3V	200000000

#define ICST525_VCO_MAX_5V	320000000



extern const unsigned char icst525_s2div[];

extern const unsigned char icst525_idx2s[];



#endif