Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal...

[sfrench/cifs-2.6.git] / arch / arm / plat-omap / include / plat / irqs.h

diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 2910de921c52b3acf70246ccd55d1da0611b40a5..d7792837046318c8ccbf96459874af73a64c9116 100644 (file)
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -315,9 +315,12 @@
 #define INT_34XX_SSM_ABORT_IRQ 6
 #define INT_34XX_SYS_NIRQ      7
 #define INT_34XX_D2D_FW_IRQ    8
+#define INT_34XX_L3_DBG_IRQ     9
+#define INT_34XX_L3_APP_IRQ     10
 #define INT_34XX_PRCM_MPU_IRQ  11
 #define INT_34XX_MCBSP1_IRQ    16
 #define INT_34XX_MCBSP2_IRQ    17
+#define INT_34XX_GPMC_IRQ      20
 #define INT_34XX_MCBSP3_IRQ    22
 #define INT_34XX_MCBSP4_IRQ    23
 #define INT_34XX_CAM_IRQ       24
@@ -411,7 +414,13 @@
 #define TWL_IRQ_END            TWL6030_IRQ_END
 #endif
 
-#define NR_IRQS                        TWL_IRQ_END
+/* GPMC related */
+#define OMAP_GPMC_IRQ_BASE     (TWL_IRQ_END)
+#define OMAP_GPMC_NR_IRQS      7
+#define OMAP_GPMC_IRQ_END      (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS)
+
+
+#define NR_IRQS                        OMAP_GPMC_IRQ_END
 
 #define OMAP_IRQ_BIT(irq)      (1 << ((irq) % 32))