Skip to contentSkip to conversation

pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

PATCH New Philipp Zabel 3 participants 4 messages Apr 21, 2011 – Jul 5, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

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 <[email protected]>
---
 arch/arm/mach-pxa/include/mach/magician.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/include/mach/magician.h +2 -1
index 0a2efcf..e9e6162 100644
@@ -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)
Signature · 1 line
1.7.4.4
Applied
#1 lore raw

PATCH 1/1 pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

Quoted 6 lines · Philipp Zabel

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

Applied.

Quoted 30 lines

---
?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++- ?1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/include/mach/magician.h +0 -0
index 0a2efcf..e9e6162 100644
@@ -12,6 +12,7 @@

?#ifndef _MAGICIAN_H_
?#define _MAGICIAN_H_

+#include <mach/gpio.h>
?#include <mach/irqs.h>

?/*

arch/arm/mach-pxa/include/mach/magician.h +0 -0
@@ -77,7 +78,7 @@

?* CPLD EGPIOs
?*/

arch/arm/mach-pxa/include/mach/magician.h +1 -1
-#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

#2 lore raw

PATCH 1/1 pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

Quoted 22 lines · Eric Miao
Quoted 6 lines · Philipp Zabel

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

Applied.

Quoted 12 lines

---
?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++- ?1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/include/mach/magician.h +0 -0
index 0a2efcf..e9e6162 100644
@@ -12,6 +12,7 @@

?#ifndef _MAGICIAN_H_
?#define _MAGICIAN_H_

Quoted 1 line
Quoted 1 line

+#include <mach/gpio.h>

Note that there's yet another mach/gpio.h here.

#3 lore raw

PATCH 1/1 pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

Quoted 23 lines · Russell King - ARM Linux
Quoted 22 lines · Eric Miao
Quoted 6 lines · Philipp Zabel

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

Applied.

Quoted 12 lines

---
?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++- ?1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/include/mach/magician.h +0 -0
index 0a2efcf..e9e6162 100644
@@ -12,6 +12,7 @@

?#ifndef _MAGICIAN_H_
?#define _MAGICIAN_H_

Quoted 4 lines
Quoted 1 line
Quoted 1 line

+#include <mach/gpio.h>

Note that there's yet another mach/gpio.h here.

Fixed.