From a58fbcd8ad17ddaa0c7aadbbbd20de4ebc807fa4 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 6 Jan 2009 17:37:37 +0800 Subject: [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 instead of generic gpio.c Signed-off-by: Eric Miao --- arch/arm/mach-pxa/pxa3xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/pxa3xx.c') diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index e626b79cbee..b02d4544dc9 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -538,7 +539,7 @@ void __init pxa3xx_init_irq(void) __asm__ __volatile__("mcr p15, 0, %0, c15, c1, 0\n": :"r"(value)); pxa_init_irq(56, pxa3xx_set_wake); - pxa_init_gpio(128, NULL); + pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL); } /* -- cgit v1.2.3-18-g5258