* [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
@ 2009-10-12 20:51 Vikram Pandita
2009-10-12 21:05 ` Menon, Nishanth
2009-10-13 17:18 ` [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Tony Lindgren
0 siblings, 2 replies; 12+ messages in thread
From: Vikram Pandita @ 2009-10-12 20:51 UTC (permalink / raw)
To: nm; +Cc: linux-omap, Vikram Pandita
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
--
1.6.5.rc1.19.g8426
^ permalink raw reply related [flat|nested] 12+ messages in thread
* RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-12 20:51 [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Vikram Pandita
@ 2009-10-12 21:05 ` Menon, Nishanth
2009-10-12 21:07 ` Pandita, Vikram
2009-10-13 17:18 ` [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Tony Lindgren
1 sibling, 1 reply; 12+ messages in thread
From: Menon, Nishanth @ 2009-10-12 21:05 UTC (permalink / raw)
To: Pandita, Vikram; +Cc: linux-omap@vger.kernel.org
> -----Original Message-----
> From: Pandita, Vikram
> Sent: Monday, October 12, 2009 3:51 PM
>
> 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
Dumb question: why is this needed? cpu_is_omap3530,15,25,03 don't seems to declare these..
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-12 21:05 ` Menon, Nishanth
@ 2009-10-12 21:07 ` Pandita, Vikram
2009-10-12 21:09 ` Menon, Nishanth
2009-10-13 10:03 ` Shilimkar, Santosh
0 siblings, 2 replies; 12+ messages in thread
From: Pandita, Vikram @ 2009-10-12 21:07 UTC (permalink / raw)
To: Menon, Nishanth; +Cc: linux-omap@vger.kernel.org
>-----Original Message-----
>From: Menon, Nishanth
>Sent: Monday, October 12, 2009 4:05 PM
>To: Pandita, Vikram
>Cc: linux-omap@vger.kernel.org
>Subject: RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
>
>> -----Original Message-----
>> From: Pandita, Vikram
>> Sent: Monday, October 12, 2009 3:51 PM
>>
>> 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
>Dumb question: why is this needed? cpu_is_omap3530,15,25,03 don't seems to declare these..
If in some file, you want to distinguish between 3630 vs 3430,
and the build is for 3430 only, then cpu_is_omap3630() should return 0.
Eg: opp table allocation based on run time check
Omap35xx may also need it for the opp in future I guess.
>
>Regards,
>Nishanth Menon
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-12 21:07 ` Pandita, Vikram
@ 2009-10-12 21:09 ` Menon, Nishanth
2009-10-13 10:03 ` Shilimkar, Santosh
1 sibling, 0 replies; 12+ messages in thread
From: Menon, Nishanth @ 2009-10-12 21:09 UTC (permalink / raw)
To: Pandita, Vikram; +Cc: linux-omap@vger.kernel.org
> -----Original Message-----
> From: Pandita, Vikram
> Sent: Monday, October 12, 2009 4:08 PM
> >
> >> -----Original Message-----
> >> From: Pandita, Vikram
> >> Sent: Monday, October 12, 2009 3:51 PM
> >>
> >> 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
> >Dumb question: why is this needed? cpu_is_omap3530,15,25,03 don't seems
> to declare these..
>
> If in some file, you want to distinguish between 3630 vs 3430,
> and the build is for 3430 only, then cpu_is_omap3630() should return 0.
>
> Eg: opp table allocation based on run time check
>
> Omap35xx may also need it for the opp in future I guess.
Could you add them in a single patch please?
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-12 21:07 ` Pandita, Vikram
2009-10-12 21:09 ` Menon, Nishanth
@ 2009-10-13 10:03 ` Shilimkar, Santosh
2009-10-13 10:14 ` Nishanth Menon
1 sibling, 1 reply; 12+ messages in thread
From: Shilimkar, Santosh @ 2009-10-13 10:03 UTC (permalink / raw)
To: Pandita, Vikram, Menon, Nishanth; +Cc: linux-omap@vger.kernel.org
Has anybody tried building latest linux-omap master ? The build is breaking for other OMAP processors.
CC arch/arm/mach-omap2/id.o
arch/arm/mach-omap2/id.c: In function 'omap3_cpuinfo':
arch/arm/mach-omap2/id.c:269: error: implicit declaration of function 'cpu_is_omap3630'
make[1]: *** [arch/arm/mach-omap2/id.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
This is because of " 0a9b95f21995aa3cdda82ebc6e77b0b2ab401861"
omap: Introduce OMAP3630
Below patch from Vikram fixes the build break.
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Pandita, Vikram
> Sent: Tuesday, October 13, 2009 2:38 AM
> To: Menon, Nishanth
> Cc: linux-omap@vger.kernel.org
> Subject: RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
>
>
>
> >-----Original Message-----
> >From: Menon, Nishanth
> >Sent: Monday, October 12, 2009 4:05 PM
> >To: Pandita, Vikram
> >Cc: linux-omap@vger.kernel.org
> >Subject: RE: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
> >
> >> -----Original Message-----
> >> From: Pandita, Vikram
> >> Sent: Monday, October 12, 2009 3:51 PM
> >>
> >> 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
> >Dumb question: why is this needed? cpu_is_omap3530,15,25,03 don't seems
> to declare these..
>
> If in some file, you want to distinguish between 3630 vs 3430,
> and the build is for 3430 only, then cpu_is_omap3630() should return 0.
>
> Eg: opp table allocation based on run time check
>
> Omap35xx may also need it for the opp in future I guess.
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-13 10:03 ` Shilimkar, Santosh
@ 2009-10-13 10:14 ` Nishanth Menon
2009-10-13 17:15 ` Tony Lindgren
0 siblings, 1 reply; 12+ messages in thread
From: Nishanth Menon @ 2009-10-13 10:14 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: Pandita, Vikram, Menon, Nishanth, linux-omap@vger.kernel.org
Shilimkar, Santosh said the following on 10/13/2009 05:03 AM:
> Has anybody tried building latest linux-omap master ? The build is breaking for other OMAP processors.
>
> CC arch/arm/mach-omap2/id.o
> arch/arm/mach-omap2/id.c: In function 'omap3_cpuinfo':
> arch/arm/mach-omap2/id.c:269: error: implicit declaration of function 'cpu_is_omap3630'
> make[1]: *** [arch/arm/mach-omap2/id.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
>
> This is because of " 0a9b95f21995aa3cdda82ebc6e77b0b2ab401861"
> omap: Introduce OMAP3630
>
> Below patch from Vikram fixes the build break.
>
ouch.. my bad.. thanks for answering my question. I am guessing we need
this coz of is_omap3630() translation..
Ack for the patch from me.
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-13 10:14 ` Nishanth Menon
@ 2009-10-13 17:15 ` Tony Lindgren
2009-10-13 17:43 ` [PATCH] omap: Fix cpu_is_omap35xx default defines (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
0 siblings, 1 reply; 12+ messages in thread
From: Tony Lindgren @ 2009-10-13 17:15 UTC (permalink / raw)
To: Nishanth Menon
Cc: Shilimkar, Santosh, Pandita, Vikram, Menon, Nishanth,
linux-omap@vger.kernel.org, Sanjeev Premi
* Nishanth Menon <menon.nishanth@gmail.com> [091013 03:44]:
> Shilimkar, Santosh said the following on 10/13/2009 05:03 AM:
> > Has anybody tried building latest linux-omap master ? The build is breaking for other OMAP processors.
> >
> > CC arch/arm/mach-omap2/id.o
> > arch/arm/mach-omap2/id.c: In function 'omap3_cpuinfo':
> > arch/arm/mach-omap2/id.c:269: error: implicit declaration of function 'cpu_is_omap3630'
> > make[1]: *** [arch/arm/mach-omap2/id.o] Error 1
> > make: *** [arch/arm/mach-omap2] Error 2
> >
> > This is because of " 0a9b95f21995aa3cdda82ebc6e77b0b2ab401861"
> > omap: Introduce OMAP3630
> >
> > Below patch from Vikram fixes the build break.
> >
> ouch.. my bad.. thanks for answering my question. I am guessing we need
> this coz of is_omap3630() translation..
> Ack for the patch from me.
To me it looks like all the 35x defines need the same treatment.
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero
2009-10-12 20:51 [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Vikram Pandita
2009-10-12 21:05 ` Menon, Nishanth
@ 2009-10-13 17:18 ` Tony Lindgren
2009-10-13 17:32 ` [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
1 sibling, 1 reply; 12+ messages in thread
From: Tony Lindgren @ 2009-10-13 17:18 UTC (permalink / raw)
To: Vikram Pandita; +Cc: nm, linux-omap
* 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().
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero)
2009-10-13 17:18 ` [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Tony Lindgren
@ 2009-10-13 17:32 ` Tony Lindgren
2009-10-13 18:31 ` Nishanth Menon
2009-10-13 19:09 ` Tony Lindgren
0 siblings, 2 replies; 12+ messages in thread
From: Tony Lindgren @ 2009-10-13 17:32 UTC (permalink / raw)
To: Vikram Pandita; +Cc: nm, linux-omap
[-- 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] omap: Fix cpu_is_omap35xx default defines (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero)
2009-10-13 17:15 ` Tony Lindgren
@ 2009-10-13 17:43 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2009-10-13 17:43 UTC (permalink / raw)
To: Nishanth Menon
Cc: Shilimkar, Santosh, Pandita, Vikram, Menon, Nishanth,
linux-omap@vger.kernel.org, Sanjeev Premi
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]
* Tony Lindgren <tony@atomide.com> [091013 10:15]:
> * Nishanth Menon <menon.nishanth@gmail.com> [091013 03:44]:
> > Shilimkar, Santosh said the following on 10/13/2009 05:03 AM:
> > > Has anybody tried building latest linux-omap master ? The build is breaking for other OMAP processors.
> > >
> > > CC arch/arm/mach-omap2/id.o
> > > arch/arm/mach-omap2/id.c: In function 'omap3_cpuinfo':
> > > arch/arm/mach-omap2/id.c:269: error: implicit declaration of function 'cpu_is_omap3630'
> > > make[1]: *** [arch/arm/mach-omap2/id.o] Error 1
> > > make: *** [arch/arm/mach-omap2] Error 2
> > >
> > > This is because of " 0a9b95f21995aa3cdda82ebc6e77b0b2ab401861"
> > > omap: Introduce OMAP3630
> > >
> > > Below patch from Vikram fixes the build break.
> > >
> > ouch.. my bad.. thanks for answering my question. I am guessing we need
> > this coz of is_omap3630() translation..
> > Ack for the patch from me.
>
> To me it looks like all the 35x defines need the same treatment.
And here's the patch to do that.
[-- Attachment #2: 35xx-default-defines.patch --]
[-- Type: text/x-diff, Size: 679 bytes --]
omap: Fix cpu_is_omap35xx default defines
Otherwise compilation on other processors
will fail if these are used in the code.
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 a67a95c..770cb60 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -322,6 +322,10 @@ IS_OMAP_TYPE(3430, 0x3430)
#define cpu_is_omap2423() 0
#define cpu_is_omap2430() 0
#define cpu_is_omap3430() 0
+#define cpu_is_omap3503() 0
+#define cpu_is_omap3515() 0
+#define cpu_is_omap3525() 0
+#define cpu_is_omap3530() 0
#define cpu_is_omap3630() 0
/*
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero)
2009-10-13 17:32 ` [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
@ 2009-10-13 18:31 ` Nishanth Menon
2009-10-13 19:09 ` Tony Lindgren
1 sibling, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2009-10-13 18:31 UTC (permalink / raw)
Cc: Pandita, Vikram, linux-omap@vger.kernel.org
Tony Lindgren had written, on 10/13/2009 12:32 PM, the following:
> * 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()
wondering what the standard is:
# define cpu_is_omap3430() is_omap3430()
so is it
#define cpu_is_omapXXXX() blah blah
or
#define cpu_is_omapXXXX blah blah
would have though it is cpu_is_omapXXXX()
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero)
2009-10-13 17:32 ` [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
2009-10-13 18:31 ` Nishanth Menon
@ 2009-10-13 19:09 ` Tony Lindgren
1 sibling, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2009-10-13 19:09 UTC (permalink / raw)
To: Vikram Pandita; +Cc: nm, linux-omap
* Tony Lindgren <tony@atomide.com> [091013 11:01]:
> * 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?
I've merged all these fixes into the 35xx and 36xx detection patches
in omap for-next branch, can you guys please check?
Regards,
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2009-10-13 19:10 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-12 20:51 [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Vikram Pandita
2009-10-12 21:05 ` Menon, Nishanth
2009-10-12 21:07 ` Pandita, Vikram
2009-10-12 21:09 ` Menon, Nishanth
2009-10-13 10:03 ` Shilimkar, Santosh
2009-10-13 10:14 ` Nishanth Menon
2009-10-13 17:15 ` Tony Lindgren
2009-10-13 17:43 ` [PATCH] omap: Fix cpu_is_omap35xx default defines (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
2009-10-13 17:18 ` [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero Tony Lindgren
2009-10-13 17:32 ` [PATCH] omap: Fix 35xx detection (Re: [PATCH] [RFC] omap: 3630: default cpu_is_omap3630 to zero) Tony Lindgren
2009-10-13 18:31 ` Nishanth Menon
2009-10-13 19:09 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox