瀏覽代碼

arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically

This is important for kernels supporting more than one SoC.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König 15 年之前
父節點
當前提交
abf6163288
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      arch/arm/plat-mxc/include/mach/irqs.h

+ 6 - 5
arch/arm/plat-mxc/include/mach/irqs.h

@@ -18,16 +18,17 @@
 
 
 #define MXC_GPIO_IRQ_START	MXC_INTERNAL_IRQS
 #define MXC_GPIO_IRQ_START	MXC_INTERNAL_IRQS
 
 
-#if defined CONFIG_ARCH_MX1
-#define MXC_GPIO_IRQS		(32 * 4)
-#elif defined CONFIG_ARCH_MX2
+/* these are ordered by size to support multi-SoC kernels */
+#if defined CONFIG_ARCH_MX2
 #define MXC_GPIO_IRQS		(32 * 6)
 #define MXC_GPIO_IRQS		(32 * 6)
-#elif defined CONFIG_ARCH_MX3
-#define MXC_GPIO_IRQS		(32 * 3)
+#elif defined CONFIG_ARCH_MX1
+#define MXC_GPIO_IRQS		(32 * 4)
 #elif defined CONFIG_ARCH_MX25
 #elif defined CONFIG_ARCH_MX25
 #define MXC_GPIO_IRQS		(32 * 4)
 #define MXC_GPIO_IRQS		(32 * 4)
 #elif defined CONFIG_ARCH_MXC91231
 #elif defined CONFIG_ARCH_MXC91231
 #define MXC_GPIO_IRQS		(32 * 4)
 #define MXC_GPIO_IRQS		(32 * 4)
+#elif defined CONFIG_ARCH_MX3
+#define MXC_GPIO_IRQS		(32 * 3)
 #endif
 #endif
 
 
 /*
 /*