diff options
author | Daniel Glöckner <dg@emlix.com> | 2009-05-05 15:03:22 +0000 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2009-06-22 02:37:26 -0700 |
commit | 0b3eb21b2f2222c4c1e3e21fc3cd427404d3991a (patch) | |
tree | 1bb4cd18ec2a18c22378bb5458d9dd7763108104 /arch/xtensa/include/asm | |
parent | f24e552c2dc3221dc7bd2296fd8a705283c4b2d7 (diff) | |
download | linux-0b3eb21b2f2222c4c1e3e21fc3cd427404d3991a.tar.bz2 |
xtensa: support s6000 gpio irqs and alternate function selection
Implement an irq chip to handle interrupts via gpio. The GPIO chip
initialization function now takes a bitmask denoting pins that should
be configured for their alternate function.
changes compared to v1:
- fixed bug on edge interrupt configuration
- accommodated to function name change
- moved definition of VARIANT_NR_IRQS to this patch
- renamed __XTENSA_S6000_IRQ_H to _XTENSA_S6000_IRQ_H as requested
Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Johannes Weiner <jw@emlix.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/include/asm')
-rw-r--r-- | arch/xtensa/include/asm/gpio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/gpio.h b/arch/xtensa/include/asm/gpio.h index 0763b0763960..a8c9fc46c790 100644 --- a/arch/xtensa/include/asm/gpio.h +++ b/arch/xtensa/include/asm/gpio.h @@ -38,14 +38,14 @@ static inline int gpio_cansleep(unsigned int gpio) return __gpio_cansleep(gpio); } -/* - * Not implemented, yet. - */ static inline int gpio_to_irq(unsigned int gpio) { - return -ENOSYS; + return __gpio_to_irq(gpio); } +/* + * Not implemented, yet. + */ static inline int irq_to_gpio(unsigned int irq) { return -EINVAL; |