2011-05-06 10:01:38

by Nicolas Ferre

[permalink] [raw]
Subject: [PATCH] avr32: add some more at91 to cpu.h definition

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 <[email protected]>
---
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


2011-05-06 12:04:49

by Hans-Christian Egtvedt

[permalink] [raw]
Subject: Re: [PATCH] avr32: add some more at91 to cpu.h definition

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 <[email protected]>

Will you push this update for 2.6.39? I don't have anything for Linus
right now.

Acked-by: Hans-Christian Egtvedt <[email protected]>
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

Subject: Re: [PATCH] avr32: add some more at91 to cpu.h definition

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 <[email protected]>
> >
> > 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 <[email protected]>
> > with one comment...
I've a bug fix for udc but nothing more
maybe map_io fix can go now

Best Regards,
J.

2011-05-06 12:32:00

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH] avr32: add some more at91 to cpu.h definition

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 <[email protected]>
>
> 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 <[email protected]>
> 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

2011-05-14 21:16:22

by Nicolas Ferre

[permalink] [raw]
Subject: [PATCH .39-final] avr32: add some more at91 to cpu.h definition

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 <[email protected]>
Acked-by: Hans-Christian Egtvedt <[email protected]>
---
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