diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-01-06 12:37:37 +0300 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 16:22:37 +0300 |
| commit | a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4 (patch) | |
| tree | 00b0a13c0dbe7155d5b529f9d36cc423996a3e19 /arch/arm/mach-pxa/generic.h | |
| parent | 7ebc8d56f407184a457dd5fc739cf39e423a25aa (diff) | |
| download | linux-a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4.tar.xz | |
[ARM] pxa: move IRQ handling of GPIO 0 and 1 outside of gpio.c
This is part of the work making gpio.c generic enough, the changes
include:
1. move IRQ handling of GPIO 0 and 1 outside (and back into irq.c)
2. pxa_init_gpio() accepts a range for muxed GPIO IRQs, and an IRQ
number for the muxed GPIOs
3. __gpio_is_occupied() and __gpio_is_inverted() are made inline,
and are moved into <mach/gpio.h> instead of generic gpio.c
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/generic.h')
| -rw-r--r-- | arch/arm/mach-pxa/generic.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index dc876a8e6668..bc12c9421cef 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -9,13 +9,11 @@ * published by the Free Software Foundation. */ -typedef int (*set_wake_t)(unsigned int, unsigned int); - struct sys_timer; extern struct sys_timer pxa_timer; -extern void __init pxa_init_irq(int irq_nr, set_wake_t fn); -extern void __init pxa_init_gpio(int gpio_nr, set_wake_t fn); +extern void __init pxa_init_irq(int irq_nr, + int (*set_wake)(unsigned int, unsigned int)); extern void __init pxa25x_init_irq(void); extern void __init pxa27x_init_irq(void); extern void __init pxa3xx_init_irq(void); |