aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-17 21:08:00 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-24 10:07:05 +0100
commitabf61632884ae6bfd1e7b967d5254fa7b5191e7b (patch)
treeb5c9aa8d092c994643ad16e2c0d71e56f36be425 /arch/arm/plat-mxc
parent220f7f307015e876a11bf906bf9d7fe669a097a1 (diff)
downloadkernel_samsung_aries-abf61632884ae6bfd1e7b967d5254fa7b5191e7b.zip
kernel_samsung_aries-abf61632884ae6bfd1e7b967d5254fa7b5191e7b.tar.gz
kernel_samsung_aries-abf61632884ae6bfd1e7b967d5254fa7b5191e7b.tar.bz2
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>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/include/mach/irqs.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
index 0cb3476..7ebdd71 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@ -18,16 +18,17 @@
#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)
-#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
#define MXC_GPIO_IRQS (32 * 4)
#elif defined CONFIG_ARCH_MXC91231
#define MXC_GPIO_IRQS (32 * 4)
+#elif defined CONFIG_ARCH_MX3
+#define MXC_GPIO_IRQS (32 * 3)
#endif
/*