8 files changed, 91 insertions, 145 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 04490a9f8f6e..0422e906cc9a 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -38,90 +38,6 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
-enum ixp4xx_irq_type {
-        IXP4XX_IRQ_LEVEL, IXP4XX_IRQ_EDGE
-};
-static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type);
-
-/*************************************************************************
- * GPIO acces functions
- *************************************************************************/
-
-/*
- * Configure GPIO line for input, interrupt, or output operation
- *
- * TODO: Enable/disable the irq_desc based on interrupt or output mode.
- * TODO: Should these be named ixp4xx_gpio_?
- */
-void gpio_line_config(u8 line, u32 style)
-{
-        static const int gpio2irq[] = {
-                6, 7, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29
-        };
-        u32 enable;
-        volatile u32 *int_reg;
-        u32 int_style;
-        enum ixp4xx_irq_type irq_type;
-
-        enable = *IXP4XX_GPIO_GPOER;
-
-        if (style & IXP4XX_GPIO_OUT) {
-                enable &= ~((1) << line);
-        } else if (style & IXP4XX_GPIO_IN) {
-                enable |= ((1) << line);
-
-                switch (style & IXP4XX_GPIO_INTSTYLE_MASK)
-                {
-                case (IXP4XX_GPIO_ACTIVE_HIGH):
-                        int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
-                        irq_type = IXP4XX_IRQ_LEVEL;
-                        break;
-                case (IXP4XX_GPIO_ACTIVE_LOW):
-                        int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
-                        irq_type = IXP4XX_IRQ_LEVEL;
-                        break;
-                case (IXP4XX_GPIO_RISING_EDGE):
-                        int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;
-                        irq_type = IXP4XX_IRQ_EDGE;
-                        break;
-                case (IXP4XX_GPIO_FALLING_EDGE):
-                        int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;
-                        irq_type = IXP4XX_IRQ_EDGE;
-                        break;
-                case (IXP4XX_GPIO_TRANSITIONAL):
-                        int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;
-                        irq_type = IXP4XX_IRQ_EDGE;
-                        break;
-                default:
-                        int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
-                        irq_type = IXP4XX_IRQ_LEVEL;
-                        break;
-                }
-
-                if (style & IXP4XX_GPIO_INTSTYLE_MASK)
-                        ixp4xx_config_irq(gpio2irq[line], irq_type);
-
-                if (line >= 8) {        /* pins 8-15 */ 
-                        line -= 8;
-                        int_reg = IXP4XX_GPIO_GPIT2R;
-                }
-                else {                  /* pins 0-7 */
-                        int_reg = IXP4XX_GPIO_GPIT1R;
-                }
-
-                /* Clear the style for the appropriate pin */
-                *int_reg &= ~(IXP4XX_GPIO_STYLE_CLEAR << 
-                                (line * IXP4XX_GPIO_STYLE_SIZE));
-
-                /* Set the new style */
-                *int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
-        }
-
-        *IXP4XX_GPIO_GPOER = enable;
-}
-
-EXPORT_SYMBOL(gpio_line_config);
-
 /*************************************************************************
  * IXP4xx chipset I/O mapping
  *************************************************************************/
@@ -165,6 +81,69 @@ void __init ixp4xx_map_io(void)
  *       (be it PCI or something else) configures that GPIO line
  *       as an IRQ.
  **************************************************************************/
+enum ixp4xx_irq_type {
+        IXP4XX_IRQ_LEVEL, IXP4XX_IRQ_EDGE
+};
+
+static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type);
+
+/*
+ * IRQ -> GPIO mapping table
+ */
+static int irq2gpio[32] = {
+        -1, -1, -1, -1, -1, -1,  0,  1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1,  2,  3,  4,  5,  6,
+         7,  8,  9, 10, 11, 12, -1, -1,
+};
+
+static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
+{
+        int line = irq2gpio[irq];
+        u32 int_style;
+        enum ixp4xx_irq_type irq_type;
+        volatile u32 *int_reg;
+
+        /*
+         * Only for GPIO IRQs
+         */
+        if (line < 0)
+                return -EINVAL;
+
+        if (type & IRQT_BOTHEDGE) {
+                int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;
+                irq_type = IXP4XX_IRQ_EDGE;
+        } else  if (type & IRQT_RISING) {
+                int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;
+                irq_type = IXP4XX_IRQ_EDGE;
+        } else if (type & IRQT_FALLING) {
+                int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;
+                irq_type = IXP4XX_IRQ_EDGE;
+        } else if (type & IRQT_HIGH) {
+                int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
+                irq_type = IXP4XX_IRQ_LEVEL;
+        } else if (type & IRQT_LOW) {
+                int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
+                irq_type = IXP4XX_IRQ_LEVEL;
+        }
+
+        ixp4xx_config_irq(irq, irq_type);
+
+        if (line >= 8) {        /* pins 8-15 */
+                line -= 8;
+                int_reg = IXP4XX_GPIO_GPIT2R;
+        } else {                /* pins 0-7 */
+                int_reg = IXP4XX_GPIO_GPIT1R;
+        }
+
+        /* Clear the style for the appropriate pin */
+        *int_reg &= ~(IXP4XX_GPIO_STYLE_CLEAR <<
+                        (line * IXP4XX_GPIO_STYLE_SIZE));
+
+        /* Set the new style */
+        *int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
+}
+
 static void ixp4xx_irq_mask(unsigned int irq)
 {
         if (cpu_is_ixp46x() && irq >= 32)
@@ -183,12 +162,6 @@ static void ixp4xx_irq_unmask(unsigned int irq)
 
 static void ixp4xx_irq_ack(unsigned int irq)
 {
-        static int irq2gpio[32] = {
-                -1, -1, -1, -1, -1, -1,  0,  1,
-                -1, -1, -1, -1, -1, -1, -1, -1,
-                -1, -1, -1,  2,  3,  4,  5,  6,
-                 7,  8,  9, 10, 11, 12, -1, -1,
-        };
         int line = (irq < 32) ? irq2gpio[irq] : -1;
 
         if (line >= 0)
@@ -209,12 +182,14 @@ static struct irqchip ixp4xx_irq_level_chip = {
         .ack    = ixp4xx_irq_mask,
         .mask   = ixp4xx_irq_mask,
         .unmask = ixp4xx_irq_level_unmask,
+        .type   = ixp4xx_set_irq_type
 };
 
 static struct irqchip ixp4xx_irq_edge_chip = {
         .ack    = ixp4xx_irq_ack,
         .mask   = ixp4xx_irq_mask,
         .unmask = ixp4xx_irq_unmask,
+        .type   = ixp4xx_set_irq_type
 };
 
 static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type)
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index afafb42ae129..60de8a94cff5 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -30,11 +30,8 @@ extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
 
 void __init coyote_pci_preinit(void)
 {
-        gpio_line_config(COYOTE_PCI_SLOT0_PIN,
-                        IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
-
-        gpio_line_config(COYOTE_PCI_SLOT1_PIN,
-                        IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW);
 
         gpio_line_isr_clear(COYOTE_PCI_SLOT0_PIN);
         gpio_line_isr_clear(COYOTE_PCI_SLOT1_PIN);
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 411ea9996190..8b2f25322452 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -24,11 +24,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
-void __init coyote_map_io(void)
-{
-        ixp4xx_map_io();
-}
-
 static struct flash_platform_data coyote_flash_data = {
         .map_name       = "cfi_probe",
         .width          = 2,
@@ -107,7 +102,7 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = coyote_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
@@ -125,7 +120,7 @@ MACHINE_START(IXDPG425, "Intel IXDPG425")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = coyote_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index b18035824e3e..a66484b63d36 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -35,26 +35,20 @@ extern void ixp4xx_pci_preinit(void);
 extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
 extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
 
-        /*
-        * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h
-        * Slot 0 isn't actually populated with a card connector but
-        * we initialize it anyway in case a future version has the
-        * slot populated or someone with good soldering skills has
-        * some free time.
-        */
-
-
-static void gtwx5715_init_gpio(u8 pin, u32 style)
-{
-        gpio_line_config(pin, style | IXP4XX_GPIO_ACTIVE_LOW);
-
-        if (style & IXP4XX_GPIO_IN) gpio_line_isr_clear(pin);
-}
 
+/*
+ * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h
+ * Slot 0 isn't actually populated with a card connector but
+ * we initialize it anyway in case a future version has the
+ * slot populated or someone with good soldering skills has
+ * some free time.
+ */
 void __init gtwx5715_pci_preinit(void)
 {
-        gtwx5715_init_gpio(GTWX5715_PCI_SLOT0_INTA_GPIO,        IXP4XX_GPIO_IN);
-        gtwx5715_init_gpio(GTWX5715_PCI_SLOT1_INTA_GPIO,        IXP4XX_GPIO_IN);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQT_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQT_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQT_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQT_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index 333459d6aa46..3fd92c5cbaa8 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -101,12 +101,6 @@ static struct platform_device gtwx5715_uart_device = {
         .resource       = gtwx5715_uart_resources,
 };
 
-
-void __init gtwx5715_map_io(void)
-{
-        ixp4xx_map_io();
-}
-
 static struct flash_platform_data gtwx5715_flash_data = {
         .map_name       = "cfi_probe",
         .width          = 2,
@@ -144,7 +138,7 @@ MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_UART2_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = gtwx5715_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index c2ab9ebb5980..f9a1d3e7d692 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -27,14 +27,10 @@
 
 void __init ixdp425_pci_preinit(void)
 {
-        gpio_line_config(IXDP425_PCI_INTA_PIN,
-                                IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
-        gpio_line_config(IXDP425_PCI_INTB_PIN, 
-                                IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
-        gpio_line_config(IXDP425_PCI_INTC_PIN, 
-                                IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
-        gpio_line_config(IXDP425_PCI_INTD_PIN, 
-                                IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTA, IRQT_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTB, IRQT_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW);
 
         gpio_line_isr_clear(IXDP425_PCI_INTA_PIN);
         gpio_line_isr_clear(IXDP425_PCI_INTB_PIN);
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index fa0646c8693b..6c14ff3c23a0 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -24,11 +24,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
-void __init ixdp425_map_io(void) 
-{
-        ixp4xx_map_io();
-}
-
 static struct flash_platform_data ixdp425_flash_data = {
         .map_name       = "cfi_probe",
         .width          = 2,
@@ -133,7 +128,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = ixdp425_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
@@ -145,7 +140,7 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = ixdp425_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
@@ -157,7 +152,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = ixdp425_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
@@ -176,7 +171,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")
         .phys_ram       = PHYS_OFFSET,
         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = ixdp425_map_io,
+        .map_io         = ixp4xx_map_io,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
         .boot_params    = 0x0100,
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index ce4563f00676..fe5e7660de1d 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -29,8 +29,8 @@ extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
 
 void __init ixdpg425_pci_preinit(void)
 {
-        gpio_line_config(6, IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
-        gpio_line_config(7, IXP4XX_GPIO_IN | IXP4XX_GPIO_ACTIVE_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW);
 
         gpio_line_isr_clear(6);
         gpio_line_isr_clear(7);