* [PATCH] avr32: add some more at91 to cpu.h definition
@ 2011-05-06 11:08 Nicolas Ferre
2011-05-06 12:04 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Ferre @ 2011-05-06 11:08 UTC (permalink / raw)
To: kernel, Hans-Christian.Egtvedt
Cc: linux-kernel, linux-arm-kernel, Nicolas Ferre
Somme common drivers will need those at91 cpu_is_xxx() definitions.
Those definitions are already in Linus' tree so if we want to use them
in common drivers, we will need them in AVR32 cpu.h file.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/avr32/mach-at32ap/include/mach/cpu.h | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h
index 9c96a13..a927d9e 100644
--- a/arch/avr32/mach-at32ap/include/mach/cpu.h
+++ b/arch/avr32/mach-at32ap/include/mach/cpu.h
@@ -31,8 +31,21 @@
#define cpu_is_at91sam9263() (0)
#define cpu_is_at91sam9rl() (0)
#define cpu_is_at91cap9() (0)
+#define cpu_is_at91cap9_revB() (0)
+#define cpu_is_at91cap9_revC() (0)
#define cpu_is_at91sam9g10() (0)
+#define cpu_is_at91sam9g20() (0)
#define cpu_is_at91sam9g45() (0)
#define cpu_is_at91sam9g45es() (0)
+#define cpu_is_at91sam9m10() (0)
+#define cpu_is_at91sam9g46() (0)
+#define cpu_is_at91sam9m11() (0)
+#define cpu_is_at91sam9x5() (0)
+#define cpu_is_at91sam9g15() (0)
+#define cpu_is_at91sam9g35() (0)
+#define cpu_is_at91sam9x35() (0)
+#define cpu_is_at91sam9g25() (0)
+#define cpu_is_at91sam9x25() (0)
+
#endif /* __ASM_ARCH_CPU_H */
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] avr32: add some more at91 to cpu.h definition
2011-05-06 11:08 [PATCH] avr32: add some more at91 to cpu.h definition Nicolas Ferre
@ 2011-05-06 12:04 ` Hans-Christian Egtvedt
2011-05-06 12:31 ` Nicolas Ferre
0 siblings, 1 reply; 5+ messages in thread
From: Hans-Christian Egtvedt @ 2011-05-06 12:04 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: kernel, linux-kernel, linux-arm-kernel
On Fri, 2011-05-06 at 13:08 +0200, Nicolas Ferre wrote:
> Somme common drivers will need those at91 cpu_is_xxx() definitions.
> Those definitions are already in Linus' tree so if we want to use them
> in common drivers, we will need them in AVR32 cpu.h file.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Will you push this update for 2.6.39? I don't have anything for Linus
right now.
Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
with one comment...
> ---
> arch/avr32/mach-at32ap/include/mach/cpu.h | 13 +++++++++++++
> 1 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h
> index 9c96a13..a927d9e 100644
> --- a/arch/avr32/mach-at32ap/include/mach/cpu.h
> +++ b/arch/avr32/mach-at32ap/include/mach/cpu.h
> @@ -31,8 +31,21 @@
> #define cpu_is_at91sam9263() (0)
> #define cpu_is_at91sam9rl() (0)
> #define cpu_is_at91cap9() (0)
> +#define cpu_is_at91cap9_revB() (0)
> +#define cpu_is_at91cap9_revC() (0)
> #define cpu_is_at91sam9g10() (0)
> +#define cpu_is_at91sam9g20() (0)
> #define cpu_is_at91sam9g45() (0)
> #define cpu_is_at91sam9g45es() (0)
> +#define cpu_is_at91sam9m10() (0)
> +#define cpu_is_at91sam9g46() (0)
> +#define cpu_is_at91sam9m11() (0)
> +#define cpu_is_at91sam9x5() (0)
> +#define cpu_is_at91sam9g15() (0)
> +#define cpu_is_at91sam9g35() (0)
> +#define cpu_is_at91sam9x35() (0)
> +#define cpu_is_at91sam9g25() (0)
> +#define cpu_is_at91sam9x25() (0)
> +
No need for this extra newline.
>
> #endif /* __ASM_ARCH_CPU_H */
--
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] avr32: add some more at91 to cpu.h definition
2011-05-06 12:04 ` Hans-Christian Egtvedt
@ 2011-05-06 12:31 ` Nicolas Ferre
2011-05-06 12:28 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-14 22:23 ` [PATCH .39-final] " Nicolas Ferre
0 siblings, 2 replies; 5+ messages in thread
From: Nicolas Ferre @ 2011-05-06 12:31 UTC (permalink / raw)
To: Hans-Christian Egtvedt; +Cc: kernel, linux-kernel, linux-arm-kernel
Le 06/05/2011 14:04, Hans-Christian Egtvedt :
> On Fri, 2011-05-06 at 13:08 +0200, Nicolas Ferre wrote:
>> Somme common drivers will need those at91 cpu_is_xxx() definitions.
>> Those definitions are already in Linus' tree so if we want to use them
>> in common drivers, we will need them in AVR32 cpu.h file.
>>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> Will you push this update for 2.6.39? I don't have anything for Linus
> right now.
Ah, Linus has just pulled from our tree...
Maybe we can wait a few days to see if some fixes have to be pushed
upstream before -final...
> Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
> with one comment...
;-)
>> ---
>> arch/avr32/mach-at32ap/include/mach/cpu.h | 13 +++++++++++++
>> 1 files changed, 13 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h
>> index 9c96a13..a927d9e 100644
>> --- a/arch/avr32/mach-at32ap/include/mach/cpu.h
>> +++ b/arch/avr32/mach-at32ap/include/mach/cpu.h
>> @@ -31,8 +31,21 @@
>> #define cpu_is_at91sam9263() (0)
>> #define cpu_is_at91sam9rl() (0)
>> #define cpu_is_at91cap9() (0)
>> +#define cpu_is_at91cap9_revB() (0)
>> +#define cpu_is_at91cap9_revC() (0)
>> #define cpu_is_at91sam9g10() (0)
>> +#define cpu_is_at91sam9g20() (0)
>> #define cpu_is_at91sam9g45() (0)
>> #define cpu_is_at91sam9g45es() (0)
>> +#define cpu_is_at91sam9m10() (0)
>> +#define cpu_is_at91sam9g46() (0)
>> +#define cpu_is_at91sam9m11() (0)
>> +#define cpu_is_at91sam9x5() (0)
>> +#define cpu_is_at91sam9g15() (0)
>> +#define cpu_is_at91sam9g35() (0)
>> +#define cpu_is_at91sam9x35() (0)
>> +#define cpu_is_at91sam9g25() (0)
>> +#define cpu_is_at91sam9x25() (0)
>> +
>
> No need for this extra newline.
True.
>> #endif /* __ASM_ARCH_CPU_H */
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] avr32: add some more at91 to cpu.h definition
2011-05-06 12:31 ` Nicolas Ferre
@ 2011-05-06 12:28 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-14 22:23 ` [PATCH .39-final] " Nicolas Ferre
1 sibling, 0 replies; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-05-06 12:28 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Hans-Christian Egtvedt, kernel, linux-kernel, linux-arm-kernel
On 14:31 Fri 06 May , Nicolas Ferre wrote:
> Le 06/05/2011 14:04, Hans-Christian Egtvedt :
> > On Fri, 2011-05-06 at 13:08 +0200, Nicolas Ferre wrote:
> >> Somme common drivers will need those at91 cpu_is_xxx() definitions.
> >> Those definitions are already in Linus' tree so if we want to use them
> >> in common drivers, we will need them in AVR32 cpu.h file.
> >>
> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >
> > Will you push this update for 2.6.39? I don't have anything for Linus
> > right now.
>
> Ah, Linus has just pulled from our tree...
> Maybe we can wait a few days to see if some fixes have to be pushed
> upstream before -final...
>
> > Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
> > with one comment...
I've a bug fix for udc but nothing more
maybe map_io fix can go now
Best Regards,
J.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH .39-final] avr32: add some more at91 to cpu.h definition
2011-05-06 12:31 ` Nicolas Ferre
2011-05-06 12:28 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-05-14 22:23 ` Nicolas Ferre
1 sibling, 0 replies; 5+ messages in thread
From: Nicolas Ferre @ 2011-05-14 22:23 UTC (permalink / raw)
To: torvalds
Cc: hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel,
Nicolas Ferre
Somme common drivers will need those at91 cpu_is_xxx() definitions.
Those definitions are already in Linus' tree so if we want to use them
in common drivers, we will need them in AVR32 cpu.h file.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
---
Linus,
AVR32 and AT91 were waiting for more fixes to add to a pull request for you.
But it seems that we do not have more patches that can go to .39-final.
So, maybe you can take this trivial patch. It shall allow all definitions to be
available for both architectures into the same kernel revision.
Thanks, best regards.
arch/avr32/mach-at32ap/include/mach/cpu.h | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h
index 9c96a13..8181293 100644
--- a/arch/avr32/mach-at32ap/include/mach/cpu.h
+++ b/arch/avr32/mach-at32ap/include/mach/cpu.h
@@ -31,8 +31,20 @@
#define cpu_is_at91sam9263() (0)
#define cpu_is_at91sam9rl() (0)
#define cpu_is_at91cap9() (0)
+#define cpu_is_at91cap9_revB() (0)
+#define cpu_is_at91cap9_revC() (0)
#define cpu_is_at91sam9g10() (0)
+#define cpu_is_at91sam9g20() (0)
#define cpu_is_at91sam9g45() (0)
#define cpu_is_at91sam9g45es() (0)
+#define cpu_is_at91sam9m10() (0)
+#define cpu_is_at91sam9g46() (0)
+#define cpu_is_at91sam9m11() (0)
+#define cpu_is_at91sam9x5() (0)
+#define cpu_is_at91sam9g15() (0)
+#define cpu_is_at91sam9g35() (0)
+#define cpu_is_at91sam9x35() (0)
+#define cpu_is_at91sam9g25() (0)
+#define cpu_is_at91sam9x25() (0)
#endif /* __ASM_ARCH_CPU_H */
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-14 21:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-06 11:08 [PATCH] avr32: add some more at91 to cpu.h definition Nicolas Ferre
2011-05-06 12:04 ` Hans-Christian Egtvedt
2011-05-06 12:31 ` Nicolas Ferre
2011-05-06 12:28 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-14 22:23 ` [PATCH .39-final] " Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox