pxa/magician: align MAGICIAN_EGPIO_BASE with NR_BUILTIN_GPIO

PATCH New Philipp Zabel 1 participant 1 message Apr 27, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support

lore

Share & tools

lore

Philipp Zabel

author

2011-04-27 18:49 UTC #0 lore raw

PATCH 1/1 pxa/magician: align MAGICIAN_EGPIO_BASE 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