Commit 4de2edbd authored by Russell King's avatar Russell King
Browse files

ARM: ICST: provide definitions for max/min VCO frequencies 



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

arch/arm/common/icst307.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ icst307_khz_to_vco(const struct icst_params *p, unsigned long freq) 
		/*

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

		 */

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

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

			break;

	} while (i < ARRAY_SIZE(idx2s));

arch/arm/common/icst525.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ icst525_khz_to_vco(const struct icst_params *p, unsigned long freq) 
		 * f must be between 10MHz and

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

		 */

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

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

			break;

	} while (i < ARRAY_SIZE(idx2s));

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

+7 −0
Original line number Diff line number Diff line
@@ -21,4 +21,11 @@ 
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);



/*

 * ICST307 VCO frequency must be between 6MHz and 200MHz (3.3 or 5V).

 * This frequency is pre-output divider.

 */

#define ICST307_VCO_MIN	6000

#define ICST307_VCO_MAX	200000



#endif

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

+8 −0
Original line number Diff line number Diff line
@@ -19,4 +19,12 @@ 
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);



/*

 * ICST525 VCO frequency must be between 10MHz and 200MHz (3V) or 320MHz (5V).

 * This frequency is pre-output divider.

 */

#define ICST525_VCO_MIN		10000

#define ICST525_VCO_MAX_3V	200000

#define ICST525_VCO_MAX_5V	320000



#endif

arch/arm/mach-integrator/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct cpufreq_driver integrator_driver; 


static const struct icst_params lclk_params = {

	.ref		= 24000,

	.vco_max	= 320000,

	.vco_max	= ICST525_VCO_MAX_5V,

	.vd_min		= 8,

	.vd_max		= 132,

	.rd_min		= 24,
@@ -42,7 +42,7 @@ static const struct icst_params lclk_params = { 


static const struct icst_params cclk_params = {

	.ref		= 24000,

	.vco_max	= 320000,

	.vco_max	= ICST525_VCO_MAX_5V,

	.vd_min		= 12,

	.vd_max		= 160,

	.rd_min		= 24,