aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock2xxx.c
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.balbi@nokia.com>2010-01-08 17:23:15 -0500
committerPaul Walmsley <paul@pwsan.com>2010-01-08 17:23:15 -0500
commit19fe458310915a216bbba32a210b6f29ac7c929f (patch)
treebacb97b631338e52af8c915a1333efff2b3460ff /arch/arm/mach-omap2/clock2xxx.c
parent9b11769f998e138cbc89ba822316aa3e63912856 (diff)
OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
if we enable CPUFREQ we can't build omap2 for two reasons, one of them is fixed by the patch below. It's failing because the __must_be_array() check in ARRAY_SIZE() is failing and printing the following message: arch/arm/mach-omap2/clock2xxx.c:453: error: negative width in bit-field '<anonymous>' Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> [paul@pwsan.com: commit message updated; changed rate variable name] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock2xxx.c')
-rw-r--r--arch/arm/mach-omap2/clock2xxx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c
index d0e3fb7f9298..ce6742f7894a 100644
--- a/arch/arm/mach-omap2/clock2xxx.c
+++ b/arch/arm/mach-omap2/clock2xxx.c
@@ -455,12 +455,15 @@ static struct cpufreq_frequency_table freq_table[ARRAY_SIZE(rate_table)];
455void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) 455void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
456{ 456{
457 struct prcm_config *prcm; 457 struct prcm_config *prcm;
458 long sys_ck_rate;
458 int i = 0; 459 int i = 0;
459 460
461 sys_ck_rate = clk_get_rate(sclk);
462
460 for (prcm = rate_table; prcm->mpu_speed; prcm++) { 463 for (prcm = rate_table; prcm->mpu_speed; prcm++) {
461 if (!(prcm->flags & cpu_mask)) 464 if (!(prcm->flags & cpu_mask))
462 continue; 465 continue;
463 if (prcm->xtal_speed != sys_ck.rate) 466 if (prcm->xtal_speed != sys_ck_rate)
464 continue; 467 continue;
465 468
466 /* don't put bypass rates in table */ 469 /* don't put bypass rates in table */