diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-01-06 17:37:37 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 21:22:37 +0800 |
| commit | a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4 (patch) | |
| tree | 00b0a13c0dbe7155d5b529f9d36cc423996a3e19 /arch/arm/mach-pxa/pxa27x.c | |
| parent | 7ebc8d56f407184a457dd5fc739cf39e423a25aa (diff) | |
| download | kernel_samsung_smdk4412-a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4.zip kernel_samsung_smdk4412-a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4.tar.gz kernel_samsung_smdk4412-a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4.tar.bz2 | |
[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/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index c8b469b..a425ec7 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -21,6 +21,7 @@ #include <mach/hardware.h> #include <asm/irq.h> #include <mach/irqs.h> +#include <mach/gpio.h> #include <mach/pxa27x.h> #include <mach/reset.h> #include <mach/ohci.h> @@ -330,7 +331,7 @@ static int pxa27x_set_wake(unsigned int irq, unsigned int on) void __init pxa27x_init_irq(void) { pxa_init_irq(34, pxa27x_set_wake); - pxa_init_gpio(121, pxa27x_set_wake); + pxa_init_gpio(IRQ_GPIO_2_x, 2, 120, pxa27x_set_wake); } /* |