1 files changed, 61 insertions, 57 deletions

diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h
index e27619e442c0..dbced61d9fda 100644
--- a/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/arch/arm/plat-mxc/include/mach/mx31.h
@@ -118,63 +118,67 @@
 #define MX31_IO_P2V(x)                  IMX_IO_P2V(x)
 #define MX31_IO_ADDRESS(x)              IOMEM(MX31_IO_P2V(x))
 
-#define MX31_INT_I2C3           3
-#define MX31_INT_I2C2           4
-#define MX31_INT_MPEG4_ENCODER  5
-#define MX31_INT_RTIC           6
-#define MX31_INT_FIRI           7
-#define MX31_INT_SDHC2          8
-#define MX31_INT_SDHC1          9
-#define MX31_INT_I2C1           10
-#define MX31_INT_SSI2           11
-#define MX31_INT_SSI1           12
-#define MX31_INT_CSPI2          13
-#define MX31_INT_CSPI1          14
-#define MX31_INT_ATA            15
-#define MX31_INT_MBX            16
-#define MX31_INT_CSPI3          17
-#define MX31_INT_UART3          18
-#define MX31_INT_IIM            19
-#define MX31_INT_SIM2           20
-#define MX31_INT_SIM1           21
-#define MX31_INT_RNGA           22
-#define MX31_INT_EVTMON         23
-#define MX31_INT_KPP            24
-#define MX31_INT_RTC            25
-#define MX31_INT_PWM            26
-#define MX31_INT_EPIT2          27
-#define MX31_INT_EPIT1          28
-#define MX31_INT_GPT            29
-#define MX31_INT_POWER_FAIL     30
-#define MX31_INT_CCM_DVFS       31
-#define MX31_INT_UART2          32
-#define MX31_INT_NFC            33
-#define MX31_INT_SDMA           34
-#define MX31_INT_USB_HS1        35
-#define MX31_INT_USB_HS2        36
-#define MX31_INT_USB_OTG        37
-#define MX31_INT_MSHC1          39
-#define MX31_INT_MSHC2          40
-#define MX31_INT_IPU_ERR        41
-#define MX31_INT_IPU_SYN        42
-#define MX31_INT_UART1          45
-#define MX31_INT_UART4          46
-#define MX31_INT_UART5          47
-#define MX31_INT_ECT            48
-#define MX31_INT_SCC_SCM        49
-#define MX31_INT_SCC_SMN        50
-#define MX31_INT_GPIO2          51
-#define MX31_INT_GPIO1          52
-#define MX31_INT_CCM            53
-#define MX31_INT_PCMCIA         54
-#define MX31_INT_WDOG           55
-#define MX31_INT_GPIO3          56
-#define MX31_INT_EXT_POWER      58
-#define MX31_INT_EXT_TEMPER     59
-#define MX31_INT_EXT_SENSOR60   60
-#define MX31_INT_EXT_SENSOR61   61
-#define MX31_INT_EXT_WDOG       62
-#define MX31_INT_EXT_TV         63
+/*
+ * Interrupt numbers
+ */
+#include <asm/irq.h>
+#define MX31_INT_I2C3           (NR_IRQS_LEGACY + 3)
+#define MX31_INT_I2C2           (NR_IRQS_LEGACY + 4)
+#define MX31_INT_MPEG4_ENCODER  (NR_IRQS_LEGACY + 5)
+#define MX31_INT_RTIC           (NR_IRQS_LEGACY + 6)
+#define MX31_INT_FIRI           (NR_IRQS_LEGACY + 7)
+#define MX31_INT_SDHC2          (NR_IRQS_LEGACY + 8)
+#define MX31_INT_SDHC1          (NR_IRQS_LEGACY + 9)
+#define MX31_INT_I2C1           (NR_IRQS_LEGACY + 10)
+#define MX31_INT_SSI2           (NR_IRQS_LEGACY + 11)
+#define MX31_INT_SSI1           (NR_IRQS_LEGACY + 12)
+#define MX31_INT_CSPI2          (NR_IRQS_LEGACY + 13)
+#define MX31_INT_CSPI1          (NR_IRQS_LEGACY + 14)
+#define MX31_INT_ATA            (NR_IRQS_LEGACY + 15)
+#define MX31_INT_MBX            (NR_IRQS_LEGACY + 16)
+#define MX31_INT_CSPI3          (NR_IRQS_LEGACY + 17)
+#define MX31_INT_UART3          (NR_IRQS_LEGACY + 18)
+#define MX31_INT_IIM            (NR_IRQS_LEGACY + 19)
+#define MX31_INT_SIM2           (NR_IRQS_LEGACY + 20)
+#define MX31_INT_SIM1           (NR_IRQS_LEGACY + 21)
+#define MX31_INT_RNGA           (NR_IRQS_LEGACY + 22)
+#define MX31_INT_EVTMON         (NR_IRQS_LEGACY + 23)
+#define MX31_INT_KPP            (NR_IRQS_LEGACY + 24)
+#define MX31_INT_RTC            (NR_IRQS_LEGACY + 25)
+#define MX31_INT_PWM            (NR_IRQS_LEGACY + 26)
+#define MX31_INT_EPIT2          (NR_IRQS_LEGACY + 27)
+#define MX31_INT_EPIT1          (NR_IRQS_LEGACY + 28)
+#define MX31_INT_GPT            (NR_IRQS_LEGACY + 29)
+#define MX31_INT_POWER_FAIL     (NR_IRQS_LEGACY + 30)
+#define MX31_INT_CCM_DVFS       (NR_IRQS_LEGACY + 31)
+#define MX31_INT_UART2          (NR_IRQS_LEGACY + 32)
+#define MX31_INT_NFC            (NR_IRQS_LEGACY + 33)
+#define MX31_INT_SDMA           (NR_IRQS_LEGACY + 34)
+#define MX31_INT_USB_HS1        (NR_IRQS_LEGACY + 35)
+#define MX31_INT_USB_HS2        (NR_IRQS_LEGACY + 36)
+#define MX31_INT_USB_OTG        (NR_IRQS_LEGACY + 37)
+#define MX31_INT_MSHC1          (NR_IRQS_LEGACY + 39)
+#define MX31_INT_MSHC2          (NR_IRQS_LEGACY + 40)
+#define MX31_INT_IPU_ERR        (NR_IRQS_LEGACY + 41)
+#define MX31_INT_IPU_SYN        (NR_IRQS_LEGACY + 42)
+#define MX31_INT_UART1          (NR_IRQS_LEGACY + 45)
+#define MX31_INT_UART4          (NR_IRQS_LEGACY + 46)
+#define MX31_INT_UART5          (NR_IRQS_LEGACY + 47)
+#define MX31_INT_ECT            (NR_IRQS_LEGACY + 48)
+#define MX31_INT_SCC_SCM        (NR_IRQS_LEGACY + 49)
+#define MX31_INT_SCC_SMN        (NR_IRQS_LEGACY + 50)
+#define MX31_INT_GPIO2          (NR_IRQS_LEGACY + 51)
+#define MX31_INT_GPIO1          (NR_IRQS_LEGACY + 52)
+#define MX31_INT_CCM            (NR_IRQS_LEGACY + 53)
+#define MX31_INT_PCMCIA         (NR_IRQS_LEGACY + 54)
+#define MX31_INT_WDOG           (NR_IRQS_LEGACY + 55)
+#define MX31_INT_GPIO3          (NR_IRQS_LEGACY + 56)
+#define MX31_INT_EXT_POWER      (NR_IRQS_LEGACY + 58)
+#define MX31_INT_EXT_TEMPER     (NR_IRQS_LEGACY + 59)
+#define MX31_INT_EXT_SENSOR60   (NR_IRQS_LEGACY + 60)
+#define MX31_INT_EXT_SENSOR61   (NR_IRQS_LEGACY + 61)
+#define MX31_INT_EXT_WDOG       (NR_IRQS_LEGACY + 62)
+#define MX31_INT_EXT_TV         (NR_IRQS_LEGACY + 63)
 
 #define MX31_DMA_REQ_SDHC1      20
 #define MX31_DMA_REQ_SDHC2      21