* [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
@ 2011-04-21 13:57 Philipp Zabel
2011-07-05 7:46 ` Eric Miao
0 siblings, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2011-04-21 13:57 UTC (permalink / raw)
To: linux-arm-kernel
Commit a0a4dcbca73a418477f439e812193e2591b46751
"ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
---
arch/arm/mach-pxa/include/mach/magician.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
index 0a2efcf..e9e6162 100644
--- a/arch/arm/mach-pxa/include/mach/magician.h
+++ b/arch/arm/mach-pxa/include/mach/magician.h
@@ -12,6 +12,7 @@
#ifndef _MAGICIAN_H_
#define _MAGICIAN_H_
+#include <mach/gpio.h>
#include <mach/irqs.h>
/*
@@ -77,7 +78,7 @@
* CPLD EGPIOs
*/
-#define MAGICIAN_EGPIO_BASE 0x80 /* GPIO_BOARD_START */
+#define MAGICIAN_EGPIO_BASE NR_BUILTIN_GPIO
#define MAGICIAN_EGPIO(reg,bit) \
(MAGICIAN_EGPIO_BASE + 8*reg + bit)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
2011-04-21 13:57 [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO Philipp Zabel
@ 2011-07-05 7:46 ` Eric Miao
2011-07-05 10:03 ` Russell King - ARM Linux
0 siblings, 1 reply; 4+ messages in thread
From: Eric Miao @ 2011-07-05 7:46 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Apr 21, 2011 at 9:57 PM, Philipp Zabel <pzabel@gmx.de> wrote:
> Commit a0a4dcbca73a418477f439e812193e2591b46751
> "ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
> increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
> Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.
>
> Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Applied.
> ---
> ?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++-
> ?1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
> index 0a2efcf..e9e6162 100644
> --- a/arch/arm/mach-pxa/include/mach/magician.h
> +++ b/arch/arm/mach-pxa/include/mach/magician.h
> @@ -12,6 +12,7 @@
> ?#ifndef _MAGICIAN_H_
> ?#define _MAGICIAN_H_
>
> +#include <mach/gpio.h>
> ?#include <mach/irqs.h>
>
> ?/*
> @@ -77,7 +78,7 @@
> ?* CPLD EGPIOs
> ?*/
>
> -#define MAGICIAN_EGPIO_BASE ? ? ? ? ? ? ? ? ? ?0x80 /* GPIO_BOARD_START */
> +#define MAGICIAN_EGPIO_BASE ? ? ? ? ? ? ? ? ? ?NR_BUILTIN_GPIO
> ?#define MAGICIAN_EGPIO(reg,bit) \
> ? ? ? ?(MAGICIAN_EGPIO_BASE + 8*reg + bit)
>
> --
> 1.7.4.4
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
2011-07-05 7:46 ` Eric Miao
@ 2011-07-05 10:03 ` Russell King - ARM Linux
2011-07-05 14:29 ` Eric Miao
0 siblings, 1 reply; 4+ messages in thread
From: Russell King - ARM Linux @ 2011-07-05 10:03 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 05, 2011 at 03:46:12PM +0800, Eric Miao wrote:
> On Thu, Apr 21, 2011 at 9:57 PM, Philipp Zabel <pzabel@gmx.de> wrote:
> > Commit a0a4dcbca73a418477f439e812193e2591b46751
> > "ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
> > increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
> > Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.
> >
> > Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
>
> Applied.
>
> > ---
> > ?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++-
> > ?1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
> > index 0a2efcf..e9e6162 100644
> > --- a/arch/arm/mach-pxa/include/mach/magician.h
> > +++ b/arch/arm/mach-pxa/include/mach/magician.h
> > @@ -12,6 +12,7 @@
> > ?#ifndef _MAGICIAN_H_
> > ?#define _MAGICIAN_H_
> >
> > +#include <mach/gpio.h>
Note that there's yet another mach/gpio.h here.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
2011-07-05 10:03 ` Russell King - ARM Linux
@ 2011-07-05 14:29 ` Eric Miao
0 siblings, 0 replies; 4+ messages in thread
From: Eric Miao @ 2011-07-05 14:29 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 5, 2011 at 6:03 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Tue, Jul 05, 2011 at 03:46:12PM +0800, Eric Miao wrote:
>> On Thu, Apr 21, 2011 at 9:57 PM, Philipp Zabel <pzabel@gmx.de> wrote:
>> > Commit a0a4dcbca73a418477f439e812193e2591b46751
>> > "ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
>> > increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
>> > Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.
>> >
>> > Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
>>
>> Applied.
>>
>> > ---
>> > ?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++-
>> > ?1 files changed, 2 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
>> > index 0a2efcf..e9e6162 100644
>> > --- a/arch/arm/mach-pxa/include/mach/magician.h
>> > +++ b/arch/arm/mach-pxa/include/mach/magician.h
>> > @@ -12,6 +12,7 @@
>> > ?#ifndef _MAGICIAN_H_
>> > ?#define _MAGICIAN_H_
>> >
>> > +#include <mach/gpio.h>
>
> Note that there's yet another mach/gpio.h here.
>
Fixed.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-05 14:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-21 13:57 [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO Philipp Zabel
2011-07-05 7:46 ` Eric Miao
2011-07-05 10:03 ` Russell King - ARM Linux
2011-07-05 14:29 ` Eric Miao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).