diff options
| author | Philipp Zabel <pzabel@gmx.de> | 2011-04-21 15:57:04 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-07-11 14:43:29 +0800 |
| commit | 250ccd4f343b8ecb50f94d27ef5dc131db337024 (patch) | |
| tree | 637086454c6939ca2f81d7d884f1a48482937fa1 | |
| parent | b52f0db50b8058567339dd5540e825fbd7df01dc (diff) | |
| download | blackbird-obmc-linux-250ccd4f343b8ecb50f94d27ef5dc131db337024.tar.gz blackbird-obmc-linux-250ccd4f343b8ecb50f94d27ef5dc131db337024.zip | |
ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
Commit "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>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | 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 0a2efcf7947c..7cbfc5d3f9df 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 <linux/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) |
