OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
authorFelipe Balbi <felipe.balbi@nokia.com>
Fri, 8 Jan 2010 22:23:15 +0000 (15:23 -0700)
committerPaul Walmsley <paul@pwsan.com>
Fri, 8 Jan 2010 22:23:15 +0000 (15:23 -0700)
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>
arch/arm/mach-omap2/clock2xxx.c

index d0e3fb7f92983fcbc41bedf0e9378b194aebb616..ce6742f7894a5ab7726bd6443dbb62e707f65a98 100644 (file)
@@ -455,12 +455,15 @@ static struct cpufreq_frequency_table freq_table[ARRAY_SIZE(rate_table)];
 void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
 {
        struct prcm_config *prcm;
+       long sys_ck_rate;
        int i = 0;
 
+       sys_ck_rate = clk_get_rate(sclk);
+
        for (prcm = rate_table; prcm->mpu_speed; prcm++) {
                if (!(prcm->flags & cpu_mask))
                        continue;
-               if (prcm->xtal_speed != sys_ck.rate)
+               if (prcm->xtal_speed != sys_ck_rate)
                        continue;
 
                /* don't put bypass rates in table */