Commit 22c8b4f1 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: sa11x0: Expose frequency table 



This patch exposes sa11x0's frequency table to cpufreq core. It always existed
but not as an array frequencies and not in the format cpufreq core wants it to.
Also it was present in the unit of 100kHz earlier which is made consistent with
cpufreq core now, i.e. kHz.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 291e8fb1

arch/arm/mach-sa1100/generic.c

+22 −23
Original line number Diff line number Diff line
@@ -42,23 +42,24 @@ EXPORT_SYMBOL(reset_status); 
/*

 * This table is setup for a 3.6864MHz Crystal.

 */

static const unsigned short cclk_frequency_100khz[NR_FREQS] = {

	 590,	/*  59.0 MHz */

	 737,	/*  73.7 MHz */

	 885,	/*  88.5 MHz */

	1032,	/* 103.2 MHz */

	1180,	/* 118.0 MHz */

	1327,	/* 132.7 MHz */

	1475,	/* 147.5 MHz */

	1622,	/* 162.2 MHz */

	1769,	/* 176.9 MHz */

	1917,	/* 191.7 MHz */

	2064,	/* 206.4 MHz */

	2212,	/* 221.2 MHz */

	2359,	/* 235.9 MHz */

	2507,	/* 250.7 MHz */

	2654,	/* 265.4 MHz */

	2802	/* 280.2 MHz */

struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS+1] = {

	{ .frequency = 59000,	/*  59.0 MHz */},

	{ .frequency = 73700,	/*  73.7 MHz */},

	{ .frequency = 88500,	/*  88.5 MHz */},

	{ .frequency = 103200,	/* 103.2 MHz */},

	{ .frequency = 118000,	/* 118.0 MHz */},

	{ .frequency = 132700,	/* 132.7 MHz */},

	{ .frequency = 147500,	/* 147.5 MHz */},

	{ .frequency = 162200,	/* 162.2 MHz */},

	{ .frequency = 176900,	/* 176.9 MHz */},

	{ .frequency = 191700,	/* 191.7 MHz */},

	{ .frequency = 206400,	/* 206.4 MHz */},

	{ .frequency = 221200,	/* 221.2 MHz */},

	{ .frequency = 235900,	/* 235.9 MHz */},

	{ .frequency = 250700,	/* 250.7 MHz */},

	{ .frequency = 265400,	/* 265.4 MHz */},

	{ .frequency = 280200,	/* 280.2 MHz */},

	{ .frequency = CPUFREQ_TABLE_END, },

};



/* rounds up(!)  */
@@ -66,10 +67,8 @@ unsigned int sa11x0_freq_to_ppcr(unsigned int khz) 
{

	int i;



	khz /= 100;



	for (i = 0; i < NR_FREQS; i++)

		if (cclk_frequency_100khz[i] >= khz)

		if (sa11x0_freq_table[i].frequency >= khz)

			break;



	return i;
@@ -79,7 +78,7 @@ unsigned int sa11x0_ppcr_to_freq(unsigned int idx) 
{

	unsigned int freq = 0;

	if (idx < NR_FREQS)

		freq = cclk_frequency_100khz[idx] * 100;

		freq = sa11x0_freq_table[idx].frequency;

	return freq;

}
@@ -96,7 +95,7 @@ int sa11x0_verify_speed(struct cpufreq_policy *policy) 
	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);



	/* make sure that at least one frequency is within the policy */

	tmp = cclk_frequency_100khz[sa11x0_freq_to_ppcr(policy->min)] * 100;

	tmp = sa11x0_freq_table[sa11x0_freq_to_ppcr(policy->min)].frequency;

	if (tmp > policy->max)

		policy->max = tmp;
@@ -109,7 +108,7 @@ unsigned int sa11x0_getspeed(unsigned int cpu) 
{

	if (cpu)

		return 0;

	return cclk_frequency_100khz[PPCR & 0xf] * 100;

	return sa11x0_freq_table[PPCR & 0xf].frequency;

}



/*

arch/arm/mach-sa1100/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern void sa1110_mb_disable(void); 


struct cpufreq_policy;



extern struct cpufreq_frequency_table sa11x0_freq_table[];

extern unsigned int sa11x0_freq_to_ppcr(unsigned int khz);

extern int sa11x0_verify_speed(struct cpufreq_policy *policy);

extern unsigned int sa11x0_getspeed(unsigned int cpu);

drivers/cpufreq/sa1100-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.min_freq = 59000;

	policy->cpuinfo.max_freq = 287000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	return 0;



	return cpufreq_table_validate_and_show(policy, sa11x0_freq_table);

}



static struct cpufreq_driver sa1100_driver __refdata = {

drivers/cpufreq/sa1110-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.min_freq = 59000;

	policy->cpuinfo.max_freq = 287000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	return 0;



	return cpufreq_table_validate_and_show(policy, sa11x0_freq_table);

}



/* sa1110_driver needs __refdata because it must remain after init registers

CRA Git | Maintained and supported by SUSTech CRA and CCSE