diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 21:44:18 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 21:44:18 (GMT) |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/include | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
| download | linux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 19 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 166a7a3..11ad0bf 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -4,4 +4,23 @@ /* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifndef __ARM_GPIOLIB_COMPLEX +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif + +/* + * Provide a default gpio_to_irq() which should satisfy every case. + * However, some platforms want to do this differently, so allow them + * to override it. + */ +#ifndef gpio_to_irq +#define gpio_to_irq __gpio_to_irq +#endif + #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h index b69d972..9eda7dc 100644 --- a/arch/arm/include/asm/hardware/iop3xx-gpio.h +++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h @@ -28,6 +28,8 @@ #include <mach/hardware.h> #include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_COMPLEX + #define IOP3XX_N_GPIOS 8 static inline int gpio_get_value(unsigned gpio) |