MIPS: Alchemy: Stop IRQ name sharing

Eliminate the sharing of IRQ names among the differenct Alchemy
variants.  IRQ numbers need no longer be hidden behind a
CONFIG_SOC_AU1XXX symbol: step 1 in my quest to make the Alchemy
code less reliant on a hardcoded subtype.

This patch also renames the GPIO irq number constants. It's really
an interrupt line, NOT a GPIO number!

Code which relied on certain irq numbers to have the same name
across all supported cpu subtypes is changed to determine current
cpu subtype at runtime; in some places this isn't possible so
a "compat" symbol is used.

Run-tested on DB1200.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

10 files changed, 104 insertions, 76 deletions

diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 3b228a282b07..64eb26ffd088 100644
--- a/arch/mips/alchemy/devboards/db1x00/board_setup.c
+++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c
@@ -39,32 +39,32 @@
 
 #ifdef CONFIG_MIPS_DB1500
 char irq_tab_alchemy[][5] __initdata = {
-        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - HPT371   */
-        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
+        [12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - HPT371   */
+        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 
 #ifdef CONFIG_MIPS_BOSPORUS
 char irq_tab_alchemy[][5] __initdata = {
-        [11] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 11 - miniPCI  */
-        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - SN1741   */
-        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
+        [11] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 11 - miniPCI  */
+        [12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - SN1741   */
+        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 
 #ifdef CONFIG_MIPS_MIRAGE
 char irq_tab_alchemy[][5] __initdata = {
-        [11] = { -1, INTD, INTX, INTX, INTX }, /* IDSEL 11 - SMI VGX */
-        [12] = { -1, INTX, INTX, INTC, INTX }, /* IDSEL 12 - PNX1300 */
-        [13] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 13 - miniPCI */
+        [11] = { -1, AU1500_PCI_INTD, 0xff, 0xff, 0xff }, /* IDSEL 11 - SMI VGX */
+        [12] = { -1, 0xff, 0xff, AU1500_PCI_INTC, 0xff }, /* IDSEL 12 - PNX1300 */
+        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 13 - miniPCI */
 };
 #endif
 
 #ifdef CONFIG_MIPS_DB1550
 char irq_tab_alchemy[][5] __initdata = {
-        [11] = { -1, INTC, INTX, INTX, INTX }, /* IDSEL 11 - on-board HPT371 */
-        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left) */
-        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
+        [11] = { -1, AU1550_PCI_INTC, 0xff, 0xff, 0xff }, /* IDSEL 11 - on-board HPT371 */
+        [12] = { -1, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD, AU1550_PCI_INTA }, /* IDSEL 12 - PCI slot 2 (left) */
+        [13] = { -1, AU1550_PCI_INTA, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 #endif
 
@@ -185,21 +185,35 @@ void __init board_setup(void)
 static int __init db1x00_init_irq(void)
 {
 #if defined(CONFIG_MIPS_MIRAGE)
-        set_irq_type(AU1000_GPIO_7, IRQF_TRIGGER_RISING); /* TS pendown */
+        set_irq_type(AU1500_GPIO7_INT, IRQF_TRIGGER_RISING); /* TS pendown */
 #elif defined(CONFIG_MIPS_DB1550)
-        set_irq_type(AU1000_GPIO_0, IRQF_TRIGGER_LOW);  /* CD0# */
-        set_irq_type(AU1000_GPIO_1, IRQF_TRIGGER_LOW);  /* CD1# */
-        set_irq_type(AU1000_GPIO_3, IRQF_TRIGGER_LOW);  /* CARD0# */
-        set_irq_type(AU1000_GPIO_5, IRQF_TRIGGER_LOW);  /* CARD1# */
-        set_irq_type(AU1000_GPIO_21, IRQF_TRIGGER_LOW); /* STSCHG0# */
-        set_irq_type(AU1000_GPIO_22, IRQF_TRIGGER_LOW); /* STSCHG1# */
-#else
-        set_irq_type(AU1000_GPIO_0, IRQF_TRIGGER_LOW);  /* CD0# */
-        set_irq_type(AU1000_GPIO_3, IRQF_TRIGGER_LOW);  /* CD1# */
-        set_irq_type(AU1000_GPIO_2, IRQF_TRIGGER_LOW);  /* CARD0# */
-        set_irq_type(AU1000_GPIO_5, IRQF_TRIGGER_LOW);  /* CARD1# */
-        set_irq_type(AU1000_GPIO_1, IRQF_TRIGGER_LOW);  /* STSCHG0# */
-        set_irq_type(AU1000_GPIO_4, IRQF_TRIGGER_LOW);  /* STSCHG1# */
+        set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);  /* CD0# */
+        set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);  /* CD1# */
+        set_irq_type(AU1550_GPIO3_INT, IRQF_TRIGGER_LOW);  /* CARD0# */
+        set_irq_type(AU1550_GPIO5_INT, IRQF_TRIGGER_LOW);  /* CARD1# */
+        set_irq_type(AU1550_GPIO21_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */
+        set_irq_type(AU1550_GPIO22_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */
+#elif defined(CONFIG_MIPS_DB1500)
+        set_irq_type(AU1500_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */
+        set_irq_type(AU1500_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */
+        set_irq_type(AU1500_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */
+        set_irq_type(AU1500_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */
+        set_irq_type(AU1500_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */
+        set_irq_type(AU1500_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */
+#elif defined(CONFIG_MIPS_DB1100)
+        set_irq_type(AU1100_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */
+        set_irq_type(AU1100_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */
+        set_irq_type(AU1100_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */
+        set_irq_type(AU1100_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */
+        set_irq_type(AU1100_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */
+        set_irq_type(AU1100_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */
+#elif defined(CONFIG_MIPS_DB1000)
+        set_irq_type(AU1000_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */
+        set_irq_type(AU1000_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */
+        set_irq_type(AU1000_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */
+        set_irq_type(AU1000_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */
+        set_irq_type(AU1000_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */
+        set_irq_type(AU1000_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */
 #endif
         return 0;
 }
diff --git a/arch/mips/alchemy/devboards/db1x00/platform.c b/arch/mips/alchemy/devboards/db1x00/platform.c
index b762b790512a..0ac5dd05d3c0 100644
--- a/arch/mips/alchemy/devboards/db1x00/platform.c
+++ b/arch/mips/alchemy/devboards/db1x00/platform.c
@@ -24,32 +24,46 @@
 #include <asm/mach-au1x00/au1xxx.h>
 #include "../platform.h"
 
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \
-    defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550)
-#define DB1XXX_HAS_PCMCIA
-#endif
-
 /* DB1xxx PCMCIA interrupt sources:
  * CD0/1        GPIO0/3
  * STSCHG0/1    GPIO1/4
  * CARD0/1      GPIO2/5
  * Db1550:      0/1, 21/22, 3/5
  */
-#ifndef CONFIG_MIPS_DB1550
-/* Db1000, Db1100, Db1500 */
-#define DB1XXX_PCMCIA_CD0       AU1000_GPIO_0
-#define DB1XXX_PCMCIA_STSCHG0   AU1000_GPIO_1
-#define DB1XXX_PCMCIA_CARD0     AU1000_GPIO_2
-#define DB1XXX_PCMCIA_CD1       AU1000_GPIO_3
-#define DB1XXX_PCMCIA_STSCHG1   AU1000_GPIO_4
-#define DB1XXX_PCMCIA_CARD1     AU1000_GPIO_5
+
+#define DB1XXX_HAS_PCMCIA
+
+#if defined(CONFIG_MIPS_DB1000)
+#define DB1XXX_PCMCIA_CD0       AU1000_GPIO0_INT
+#define DB1XXX_PCMCIA_STSCHG0   AU1000_GPIO1_INT
+#define DB1XXX_PCMCIA_CARD0     AU1000_GPIO2_INT
+#define DB1XXX_PCMCIA_CD1       AU1000_GPIO3_INT
+#define DB1XXX_PCMCIA_STSCHG1   AU1000_GPIO4_INT
+#define DB1XXX_PCMCIA_CARD1     AU1000_GPIO5_INT
+#elif defined(CONFIG_MIPS_DB1100)
+#define DB1XXX_PCMCIA_CD0       AU1100_GPIO0_INT
+#define DB1XXX_PCMCIA_STSCHG0   AU1100_GPIO1_INT
+#define DB1XXX_PCMCIA_CARD0     AU1100_GPIO2_INT
+#define DB1XXX_PCMCIA_CD1       AU1100_GPIO3_INT
+#define DB1XXX_PCMCIA_STSCHG1   AU1100_GPIO4_INT
+#define DB1XXX_PCMCIA_CARD1     AU1100_GPIO5_INT
+#elif defined(CONFIG_MIPS_DB1500)
+#define DB1XXX_PCMCIA_CD0       AU1500_GPIO0_INT
+#define DB1XXX_PCMCIA_STSCHG0   AU1500_GPIO1_INT
+#define DB1XXX_PCMCIA_CARD0     AU1500_GPIO2_INT
+#define DB1XXX_PCMCIA_CD1       AU1500_GPIO3_INT
+#define DB1XXX_PCMCIA_STSCHG1   AU1500_GPIO4_INT
+#define DB1XXX_PCMCIA_CARD1     AU1500_GPIO5_INT
+#elif defined(CONFIG_MIPS_DB1550)
+#define DB1XXX_PCMCIA_CD0       AU1550_GPIO0_INT
+#define DB1XXX_PCMCIA_STSCHG0   AU1550_GPIO21_INT
+#define DB1XXX_PCMCIA_CARD0     AU1550_GPIO3_INT
+#define DB1XXX_PCMCIA_CD1       AU1550_GPIO1_INT
+#define DB1XXX_PCMCIA_STSCHG1   AU1550_GPIO22_INT
+#define DB1XXX_PCMCIA_CARD1     AU1550_GPIO5_INT
 #else
-#define DB1XXX_PCMCIA_CD0       AU1000_GPIO_0
-#define DB1XXX_PCMCIA_STSCHG0   AU1500_GPIO_21
-#define DB1XXX_PCMCIA_CARD0     AU1000_GPIO_3
-#define DB1XXX_PCMCIA_CD1       AU1000_GPIO_1
-#define DB1XXX_PCMCIA_STSCHG1   AU1500_GPIO_22
-#define DB1XXX_PCMCIA_CARD1     AU1000_GPIO_5
+/* other board: no PCMCIA */
+#undef DB1XXX_HAS_PCMCIA
 #endif
 
 static int __init db1xxx_dev_init(void)
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
index f1cafea18655..287d661827eb 100644
--- a/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -186,7 +186,7 @@ void __init board_setup(void)
 
 static int __init pb1000_init_irq(void)
 {
-        set_irq_type(AU1000_GPIO_15, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1000_GPIO15_INT, IRQF_TRIGGER_LOW);
         return 0;
 }
 arch_initcall(pb1000_init_irq);
diff --git a/arch/mips/alchemy/devboards/pb1100/board_setup.c b/arch/mips/alchemy/devboards/pb1100/board_setup.c
index b282d93d1445..e0bd855f899b 100644
--- a/arch/mips/alchemy/devboards/pb1100/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1100/board_setup.c
@@ -147,10 +147,10 @@ void __init board_setup(void)
 
 static int __init pb1100_init_irq(void)
 {
-        set_irq_type(AU1000_GPIO_9,  IRQF_TRIGGER_LOW); /* PCCD# */
-        set_irq_type(AU1000_GPIO_10, IRQF_TRIGGER_LOW); /* PCSTSCHG# */
-        set_irq_type(AU1000_GPIO_11, IRQF_TRIGGER_LOW); /* PCCard# */
-        set_irq_type(AU1000_GPIO_13, IRQF_TRIGGER_LOW); /* DC_IRQ# */
+        set_irq_type(AU1100_GPIO9_INT,  IRQF_TRIGGER_LOW); /* PCCD# */
+        set_irq_type(AU1100_GPIO10_INT, IRQF_TRIGGER_LOW); /* PCSTSCHG# */
+        set_irq_type(AU1100_GPIO11_INT, IRQF_TRIGGER_LOW); /* PCCard# */
+        set_irq_type(AU1100_GPIO13_INT, IRQF_TRIGGER_LOW); /* DC_IRQ# */
 
         return 0;
 }
diff --git a/arch/mips/alchemy/devboards/pb1100/platform.c b/arch/mips/alchemy/devboards/pb1100/platform.c
index 8487da55a10c..ec932e773a40 100644
--- a/arch/mips/alchemy/devboards/pb1100/platform.c
+++ b/arch/mips/alchemy/devboards/pb1100/platform.c
@@ -33,9 +33,9 @@ static int __init pb1100_dev_init(void)
                                     PCMCIA_MEM_PSEUDO_PHYS  + 0x00040000 - 1,
                                     PCMCIA_IO_PSEUDO_PHYS,
                                     PCMCIA_IO_PSEUDO_PHYS   + 0x00001000 - 1,
-                                    AU1000_GPIO_11,      /* card */
-                                    AU1000_GPIO_9,       /* insert */
-                                    /*AU1000_GPIO_10*/0, /* stschg */
+                                    AU1100_GPIO11_INT,   /* card */
+                                    AU1100_GPIO9_INT,    /* insert */
+                                    /*AU1100_GPIO10_INT*/0, /* stschg */
                                     0,                   /* eject */
                                     0);                  /* id */
         return 0;
diff --git a/arch/mips/alchemy/devboards/pb1200/board_setup.c b/arch/mips/alchemy/devboards/pb1200/board_setup.c
index 675357a7976e..352acf68fc8d 100644
--- a/arch/mips/alchemy/devboards/pb1200/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1200/board_setup.c
@@ -171,8 +171,8 @@ static int __init pb1200_init_irq(void)
         }
 #endif
 
-        set_irq_type(AU1000_GPIO_7, IRQF_TRIGGER_LOW);
-        bcsr_init_irq(PB1200_INT_BEGIN, PB1200_INT_END, AU1000_GPIO_7);
+        set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW);
+        bcsr_init_irq(PB1200_INT_BEGIN, PB1200_INT_END, AU1200_GPIO7_INT);
 
         return 0;
 }
diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500/board_setup.c
index a148802fa427..3f0c92cb35bd 100644
--- a/arch/mips/alchemy/devboards/pb1500/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1500/board_setup.c
@@ -35,8 +35,8 @@
 
 
 char irq_tab_alchemy[][5] __initdata = {
-        [12] = { -1, INTA, INTX, INTX, INTX },   /* IDSEL 12 - HPT370   */
-        [13] = { -1, INTA, INTB, INTC, INTD },   /* IDSEL 13 - PCI slot */
+        [12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff },   /* IDSEL 12 - HPT370        */
+        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD },   /* IDSEL 13 - PCI slot */
 };
 
 
@@ -155,14 +155,14 @@ void __init board_setup(void)
 
 static int __init pb1500_init_irq(void)
 {
-        set_irq_type(AU1000_GPIO_9, IRQF_TRIGGER_LOW);  /* CD0# */
-        set_irq_type(AU1000_GPIO_10, IRQF_TRIGGER_LOW); /* CARD0 */
-        set_irq_type(AU1000_GPIO_11, IRQF_TRIGGER_LOW); /* STSCHG0# */
-        set_irq_type(AU1500_GPIO_204, IRQF_TRIGGER_HIGH);
-        set_irq_type(AU1500_GPIO_201, IRQF_TRIGGER_LOW);
-        set_irq_type(AU1500_GPIO_202, IRQF_TRIGGER_LOW);
-        set_irq_type(AU1500_GPIO_203, IRQF_TRIGGER_LOW);
-        set_irq_type(AU1500_GPIO_205, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1500_GPIO9_INT, IRQF_TRIGGER_LOW);   /* CD0# */
+        set_irq_type(AU1500_GPIO10_INT, IRQF_TRIGGER_LOW);  /* CARD0 */
+        set_irq_type(AU1500_GPIO11_INT, IRQF_TRIGGER_LOW);  /* STSCHG0# */
+        set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);
+        set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);
 
         return 0;
 }
diff --git a/arch/mips/alchemy/devboards/pb1500/platform.c b/arch/mips/alchemy/devboards/pb1500/platform.c
index 6c00cbe529a2..cdce775e2131 100644
--- a/arch/mips/alchemy/devboards/pb1500/platform.c
+++ b/arch/mips/alchemy/devboards/pb1500/platform.c
@@ -32,9 +32,9 @@ static int __init pb1500_dev_init(void)
                                     PCMCIA_MEM_PSEUDO_PHYS  + 0x00040000 - 1,
                                     PCMCIA_IO_PSEUDO_PHYS,
                                     PCMCIA_IO_PSEUDO_PHYS   + 0x00001000 - 1,
-                                    AU1000_GPIO_11,      /* card */
-                                    AU1000_GPIO_9,       /* insert */
-                                    /*AU1000_GPIO_10*/0, /* stschg */
+                                    AU1500_GPIO11_INT,   /* card */
+                                    AU1500_GPIO9_INT,    /* insert */
+                                    /*AU1500_GPIO10_INT*/0, /* stschg */
                                     0,                   /* eject */
                                     0);                  /* id */
         return 0;
diff --git a/arch/mips/alchemy/devboards/pb1550/board_setup.c b/arch/mips/alchemy/devboards/pb1550/board_setup.c
index 64a6fc4f1751..bb41740fecf5 100644
--- a/arch/mips/alchemy/devboards/pb1550/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1550/board_setup.c
@@ -39,8 +39,8 @@
 
 
 char irq_tab_alchemy[][5] __initdata = {
-        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left)  */
-        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
+        [12] = { -1, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD, AU1550_PCI_INTA }, /* IDSEL 12 - PCI slot 2 (left)  */
+        [13] = { -1, AU1550_PCI_INTA, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 
 const char *get_system_type(void)
@@ -89,9 +89,9 @@ void __init board_setup(void)
 
 static int __init pb1550_init_irq(void)
 {
-        set_irq_type(AU1000_GPIO_0, IRQF_TRIGGER_LOW);
-        set_irq_type(AU1000_GPIO_1, IRQF_TRIGGER_LOW);
-        set_irq_type(AU1500_GPIO_201_205, IRQF_TRIGGER_HIGH);
+        set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);
+        set_irq_type(AU1550_GPIO201_205_INT, IRQF_TRIGGER_HIGH);
 
         /* enable both PCMCIA card irqs in the shared line */
         alchemy_gpio2_enable_int(201);
diff --git a/arch/mips/alchemy/devboards/pb1550/platform.c b/arch/mips/alchemy/devboards/pb1550/platform.c
index aa5016c2e868..b496fb6de231 100644
--- a/arch/mips/alchemy/devboards/pb1550/platform.c
+++ b/arch/mips/alchemy/devboards/pb1550/platform.c
@@ -40,8 +40,8 @@ static int __init pb1550_dev_init(void)
                                     PCMCIA_MEM_PSEUDO_PHYS  + 0x00040000 - 1,
                                     PCMCIA_IO_PSEUDO_PHYS,
                                     PCMCIA_IO_PSEUDO_PHYS   + 0x00001000 - 1,
-                                    AU1500_GPIO_201_205,
-                                    AU1000_GPIO_0,
+                                    AU1550_GPIO201_205_INT,
+                                    AU1550_GPIO0_INT,
                                     0,
                                     0,
                                     0);
@@ -52,8 +52,8 @@ static int __init pb1550_dev_init(void)
                                     PCMCIA_MEM_PSEUDO_PHYS  + 0x00840000 - 1,
                                     PCMCIA_IO_PSEUDO_PHYS   + 0x00800000,
                                     PCMCIA_IO_PSEUDO_PHYS   + 0x00801000 - 1,
-                                    AU1500_GPIO_201_205,
-                                    AU1000_GPIO_1,
+                                    AU1550_GPIO201_205_INT,
+                                    AU1550_GPIO1_INT,
                                     0,
                                     0,
                                     1);