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>

2 files changed, 13 insertions, 13 deletions

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;