clk2xxx.c doesn't compile if CPUFREQ is enabled

clk2xxx.c doesn't compile if CPUFREQ is enabled

[Felipe Balbi]

Hi Paul,

if we enable CPUFREQ we can't build omap2 for two reasons,
one of them is fixed by the patch below but the other one
it seems like it'll need more invasive changes to the code
so I'll leave it for you to decide how to do it.

It's basically failing because the __musb_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>'

NYET-Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/clock2xxx.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c
index d0e3fb7..4e2bdfe 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)];
 void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
 {
 	struct prcm_config *prcm;
+	long rate;
 	int i = 0;
 
+	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 != rate)
 			continue;
 
 		/* don't put bypass rates in table */
-- 
1.6.6.rc0

Re: clk2xxx.c doesn't compile if CPUFREQ is enabled

[Felipe Balbi]

On Sat, Dec 26, 2009 at 12:35:54AM +0100, Balbi Felipe (Nokia-D/Helsinki) wrote:
>Hi Paul,
>
>if we enable CPUFREQ we can't build omap2 for two reasons,
>one of them is fixed by the patch below but the other one
>it seems like it'll need more invasive changes to the code
>so I'll leave it for you to decide how to do it.
>
>It's basically failing because the __musb_be_array() check

oops, it comes out naturally. Should be __must_be_array() hehe.

-- 
balbi

Re: clk2xxx.c doesn't compile if CPUFREQ is enabled

[Paul Walmsley]

Hi Felipe,

On Sat, 26 Dec 2009, Felipe Balbi wrote:

> if we enable CPUFREQ we can't build omap2 for two reasons,
> one of them is fixed by the patch below but the other one
> it seems like it'll need more invasive changes to the code
> so I'll leave it for you to decide how to do it.
> 
> It's basically failing because the __musb_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>'
> 
> NYET-Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

Care to send a version with a Signed-off-by?  I will base the remaining 
fixes on top of this.  Thanks for reporting this and sending the initial 
patch.


- Paul

> ---
>  arch/arm/mach-omap2/clock2xxx.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c
> index d0e3fb7..4e2bdfe 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)];
>  void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
>  {
>  	struct prcm_config *prcm;
> +	long rate;
>  	int i = 0;
>  
> +	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 != rate)
>  			continue;
>  
>  		/* don't put bypass rates in table */
> -- 
> 1.6.6.rc0
> 

[PATCH] arm: omap2: clk2xxx.c doesn't compile if CPUFREQ is enabled

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

if we enable CPUFREQ we can't build omap2 for two reasons,
one of them is fixed by the patch below but the other one
it seems like it'll need more invasive changes to the code
so I'll leave it for you to decide how to do it.

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>
---
 arch/arm/mach-omap2/clock2xxx.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c
index d0e3fb7..4e2bdfe 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)];
 void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
 {
 	struct prcm_config *prcm;
+	long rate;
 	int i = 0;
 
+	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 != rate)
 			continue;
 
 		/* don't put bypass rates in table */
-- 
1.6.6.35.g1d85d