[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>

diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index dc876a8e6668a048b1176ede5e4378ce86bd67b4..bc12c9421ceff138c6d28f1b3c43980da3640e11 100644 (file)
--- 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);

diff --cc arch/arm/mach-pxa/gpio.c
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/gpio.h
Simple merge

diff --cc arch/arm/mach-pxa/irq.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa25x.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa27x.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa3xx.c
Simple merge