ARM: 6164/1: Add kto and kfrom to input operands list.

[safe/jmp/linux-2.6] / arch / arm / mach-ixp4xx / gtwx5715-pci.c

diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index 0d5a424..25d2c33 100644 (file)
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -26,14 +26,16 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
-
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
-#include <asm/arch/gtwx5715.h>
+#include <mach/hardware.h>
 #include <asm/mach/pci.h>
 
+#define SLOT0_DEVID    0
+#define SLOT1_DEVID    1
+#define INTA           10 /* slot 1 has INTA and INTB crossed */
+#define INTB           11
+
 /*
- * 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
@@ -41,32 +43,26 @@
  */
 void __init gtwx5715_pci_preinit(void)
 {
-       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);
-
+       set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);
+       set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);
        ixp4xx_pci_preinit();
 }
 
 
 static int __init gtwx5715_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-       int rc;
-       static int gtwx5715_irqmap
-                       [GTWX5715_PCI_SLOT_COUNT]
-                       [GTWX5715_PCI_INT_PIN_COUNT] = {
-       {GTWX5715_PCI_SLOT0_INTA_IRQ, GTWX5715_PCI_SLOT0_INTB_IRQ},
-       {GTWX5715_PCI_SLOT1_INTA_IRQ, GTWX5715_PCI_SLOT1_INTB_IRQ},
-};
+       int rc = -1;
 
-       if (slot >= GTWX5715_PCI_SLOT_COUNT ||
-                       pin >= GTWX5715_PCI_INT_PIN_COUNT) rc = -1;
-       else
-               rc = gtwx5715_irqmap[slot][pin-1];
+       if ((slot == SLOT0_DEVID && pin == 1) ||
+           (slot == SLOT1_DEVID && pin == 2))
+               rc = IXP4XX_GPIO_IRQ(INTA);
+       else if ((slot == SLOT0_DEVID && pin == 2) ||
+                (slot == SLOT1_DEVID && pin == 1))
+               rc = IXP4XX_GPIO_IRQ(INTB);
 
-       printk("%s: Mapped slot %d pin %d to IRQ %d\n", __FUNCTION__,slot, pin, rc);
-       return(rc);
+       printk(KERN_INFO "%s: Mapped slot %d pin %d to IRQ %d\n",
+              __func__, slot, pin, rc);
+       return rc;
 }
 
 struct hw_pci gtwx5715_pci __initdata = {
@@ -81,9 +77,7 @@ struct hw_pci gtwx5715_pci __initdata = {
 int __init gtwx5715_pci_init(void)
 {
        if (machine_is_gtwx5715())
-       {
                pci_common_init(&gtwx5715_pci);
-       }
 
        return 0;
 }