[PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero)

[Tony Lindgren <tony@atomide.com>]

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

* Tony Lindgren <tony@atomide.com> [091013 10:18]:
> * Vikram Pandita <vikram.pandita@ti.com> [091012 14:31]:
> > make default cpu_is_omap3630() return zero
> > 
> > Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> > ---
> >  arch/arm/plat-omap/include/mach/cpu.h |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
> > index da9e8f8..940946e 100644
> > --- a/arch/arm/plat-omap/include/mach/cpu.h
> > +++ b/arch/arm/plat-omap/include/mach/cpu.h
> > @@ -322,6 +322,7 @@ IS_OMAP_TYPE(3430, 0x3430)
> >  #define cpu_is_omap2423()		0
> >  #define cpu_is_omap2430()		0
> >  #define cpu_is_omap3430()		0
> > +#define cpu_is_omap3630()		0
> >  
> >  /*
> >   * Whether we have MULTI_OMAP1 or not, we still need to distinguish
> > @@ -386,6 +387,7 @@ IS_OMAP_TYPE(3430, 0x3430)
> >  						(omap3_has_sgx()) &	\
> >  						(!omap3_has_iva()))
> >  # define cpu_is_omap3530		(cpu_is_omap3430())
> > +# undef cpu_is_omap3630()
> >  # define cpu_is_omap3630()		is_omap363x()
> >  #endif
> 
> This undef should be just undef cpu_is_omap3630 instead of
> cpu_is_omap3630().

Also looking at the 35xx detection code, should it not be like this?



[-- Attachment #2: 35xx-detect-fix.patch --]
[-- Type: text/x-diff, Size: 1095 bytes --]

omap: Fix 35xx detection

Should use && instead of &

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
index 111f29a..a67a95c 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -377,14 +377,14 @@ IS_OMAP_TYPE(3430, 0x3430)
 # undef cpu_is_omap3525
 # undef cpu_is_omap3530
 # define cpu_is_omap3430()		is_omap3430()
-# define cpu_is_omap3503		(cpu_is_omap3430() &		\
-						(!omap3_has_iva()) &	\
+# define cpu_is_omap3503		(cpu_is_omap3430() &&		\
+						(!omap3_has_iva()) &&	\
 						(!omap3_has_sgx()))
-# define cpu_is_omap3515		(cpu_is_omap3430() &		\
-						(omap3_has_iva()) &	\
+# define cpu_is_omap3515		(cpu_is_omap3430() &&		\
+						(omap3_has_iva()) &&	\
 						(!omap3_has_sgx()))
-# define cpu_is_omap3525		(cpu_is_omap3430() &		\
-						(omap3_has_sgx()) &	\
+# define cpu_is_omap3525		(cpu_is_omap3430() &&		\
+						(omap3_has_sgx()) &&	\
 						(!omap3_has_iva()))
 # define cpu_is_omap3530		(cpu_is_omap3430())
 # undef cpu_is_omap3630