Re: [PATCH] OMAP2: Fix a cpu type check problem.

[Tony Lindgren <tony@atomide.com>]

* Igor Grinberg <grinberg@compulab.co.il> [100810 17:25]:
> On 08/10/10 15:36, Stanley.Miao wrote:
> > cpu_is_omap3517() and cpu_is_omap3505() are the subgroups of cpu_is_omap34xx(),
> > so we should check cpu_is_omap3517() and cpu_is_omap3505() first, then check
> > cpu_is_omap34xx().
> >
> > Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
> >   
> 
> Tested-by: Igor Grinberg <grinberg@compulab.co.il>
> 
> I've just ran into this yesterday evening.
> Having a patch for this on the next day made me :)
> Tested on AM3517.

Can you please describe what breaks so we can merge this as a fix?

Regards,

Tony
 
> > ---
> >  arch/arm/mach-omap2/clock3xxx_data.c |   14 +++++++-------
> >  1 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> > index 138646d..dfdce2d 100644
> > --- a/arch/arm/mach-omap2/clock3xxx_data.c
> > +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> > @@ -3417,7 +3417,13 @@ int __init omap3xxx_clk_init(void)
> >  	struct omap_clk *c;
> >  	u32 cpu_clkflg = CK_3XXX;
> >  
> > -	if (cpu_is_omap34xx()) {
> > +	if (cpu_is_omap3517()) {
> > +		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
> > +		cpu_clkflg |= CK_3517;
> > +	} else if (cpu_is_omap3505()) {
> > +		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
> > +		cpu_clkflg |= CK_3505;
> > +	} else if (cpu_is_omap34xx()) {
> >  		cpu_mask = RATE_IN_3XXX;
> >  		cpu_clkflg |= CK_343X;
> >  
> > @@ -3432,12 +3438,6 @@ int __init omap3xxx_clk_init(void)
> >  			cpu_mask |= RATE_IN_3430ES2PLUS;
> >  			cpu_clkflg |= CK_3430ES2;
> >  		}
> > -	} else if (cpu_is_omap3517()) {
> > -		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
> > -		cpu_clkflg |= CK_3517;
> > -	} else if (cpu_is_omap3505()) {
> > -		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
> > -		cpu_clkflg |= CK_3505;
> >  	}
> >  
> >  	if (omap3_has_192mhz_clk())
> >   
> 
> -- 
> Regards,
> Igor.
>