[MIPS] Make I8259A_IRQ_BASE customizable

Move I8259A_IRQ_BASE from asm/i8259.h to asm/mach-generic/irq.h and
make it really customizable.  And remove I8259_IRQ_BASE declared on
some platforms.  Currently only NEC_CMBVR4133 is using custom
I8259A_IRQ_BASE value.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 16 insertions, 20 deletions

diff --git a/include/asm-mips/ddb5xxx/ddb5477.h b/include/asm-mips/ddb5xxx/ddb5477.h
index 27655dbd23f3..6cf177caf6d5 100644
--- a/include/asm-mips/ddb5xxx/ddb5477.h
+++ b/include/asm-mips/ddb5xxx/ddb5477.h
@@ -252,12 +252,8 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
  */
 
 #define NUM_CPU_IRQ             8
-#define NUM_I8259_IRQ           16
 #define NUM_VRC5477_IRQ         32
 
-#define DDB_IRQ_BASE            0
-
-#define I8259_IRQ_BASE          DDB_IRQ_BASE
 #define CPU_IRQ_BASE            MIPS_CPU_IRQ_BASE
 #define VRC5477_IRQ_BASE        (CPU_IRQ_BASE + NUM_CPU_IRQ)
 
@@ -301,22 +297,22 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
 /*
  * i2859 irq assignment
  */
-#define I8259_IRQ_RESERVED_0    (0 + I8259_IRQ_BASE)
-#define I8259_IRQ_KEYBOARD      (1 + I8259_IRQ_BASE)    /* M1543 default */
-#define I8259_IRQ_CASCADE       (2 + I8259_IRQ_BASE)
-#define I8259_IRQ_UART_B        (3 + I8259_IRQ_BASE)    /* M1543 default, may conflict with RTC according to schematic diagram  */
-#define I8259_IRQ_UART_A        (4 + I8259_IRQ_BASE)    /* M1543 default */
-#define I8259_IRQ_PARALLEL      (5 + I8259_IRQ_BASE)    /* M1543 default */
-#define I8259_IRQ_RESERVED_6    (6 + I8259_IRQ_BASE)
-#define I8259_IRQ_RESERVED_7    (7 + I8259_IRQ_BASE)
-#define I8259_IRQ_RTC           (8 + I8259_IRQ_BASE)    /* who set this? */
-#define I8259_IRQ_USB           (9 + I8259_IRQ_BASE)    /* ddb_setup */
-#define I8259_IRQ_PMU           (10 + I8259_IRQ_BASE)   /* ddb_setup */
-#define I8259_IRQ_RESERVED_11   (11 + I8259_IRQ_BASE)
-#define I8259_IRQ_RESERVED_12   (12 + I8259_IRQ_BASE)   /* m1543_irq_setup */
-#define I8259_IRQ_RESERVED_13   (13 + I8259_IRQ_BASE)
-#define I8259_IRQ_HDC1          (14 + I8259_IRQ_BASE)   /* default and ddb_setup */
-#define I8259_IRQ_HDC2          (15 + I8259_IRQ_BASE)   /* default */
+#define I8259_IRQ_RESERVED_0    (0 + I8259A_IRQ_BASE)
+#define I8259_IRQ_KEYBOARD      (1 + I8259A_IRQ_BASE)   /* M1543 default */
+#define I8259_IRQ_CASCADE       (2 + I8259A_IRQ_BASE)
+#define I8259_IRQ_UART_B        (3 + I8259A_IRQ_BASE)   /* M1543 default, may conflict with RTC according to schematic diagram  */
+#define I8259_IRQ_UART_A        (4 + I8259A_IRQ_BASE)   /* M1543 default */
+#define I8259_IRQ_PARALLEL      (5 + I8259A_IRQ_BASE)   /* M1543 default */
+#define I8259_IRQ_RESERVED_6    (6 + I8259A_IRQ_BASE)
+#define I8259_IRQ_RESERVED_7    (7 + I8259A_IRQ_BASE)
+#define I8259_IRQ_RTC           (8 + I8259A_IRQ_BASE)   /* who set this? */
+#define I8259_IRQ_USB           (9 + I8259A_IRQ_BASE)   /* ddb_setup */
+#define I8259_IRQ_PMU           (10 + I8259A_IRQ_BASE)  /* ddb_setup */
+#define I8259_IRQ_RESERVED_11   (11 + I8259A_IRQ_BASE)
+#define I8259_IRQ_RESERVED_12   (12 + I8259A_IRQ_BASE)  /* m1543_irq_setup */
+#define I8259_IRQ_RESERVED_13   (13 + I8259A_IRQ_BASE)
+#define I8259_IRQ_HDC1          (14 + I8259A_IRQ_BASE)  /* default and ddb_setup */
+#define I8259_IRQ_HDC2          (15 + I8259A_IRQ_BASE)  /* default */
 
 
 /*