Merge branch 'staging-next' into Linux 3.1

[pandora-kernel.git] / arch / arm / mach-exynos4 / include / mach / irqs.h

diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h
index 31f6bed..f8952f8 100644 (file)
--- a/arch/arm/mach-exynos4/include/mach/irqs.h
+++ b/arch/arm/mach-exynos4/include/mach/irqs.h
@@ -78,10 +78,10 @@
 #define IRQ_HSMMC1             IRQ_SPI(74)
 #define IRQ_HSMMC2             IRQ_SPI(75)
 #define IRQ_HSMMC3             IRQ_SPI(76)
+#define IRQ_DWMCI              IRQ_SPI(77)
 
-#define IRQ_MIPICSI0           IRQ_SPI(78)
-
-#define IRQ_MIPICSI1           IRQ_SPI(80)
+#define IRQ_MIPI_CSIS0         IRQ_SPI(78)
+#define IRQ_MIPI_CSIS1         IRQ_SPI(80)
 
 #define IRQ_ONENAND_AUDI       IRQ_SPI(82)
 #define IRQ_ROTATOR            IRQ_SPI(83)
@@ -137,6 +137,10 @@
 #define IRQ_SYSMMU_MFC_M1_0    COMBINER_IRQ(5, 6)
 #define IRQ_SYSMMU_PCIE_0      COMBINER_IRQ(5, 7)
 
+#define IRQ_FIMD0_FIFO         COMBINER_IRQ(11, 0)
+#define IRQ_FIMD0_VSYNC                COMBINER_IRQ(11, 1)
+#define IRQ_FIMD0_SYSTEM       COMBINER_IRQ(11, 2)
+
 #define MAX_COMBINER_NR                16
 
 #define IRQ_ADC                        IRQ_ADC0
@@ -154,6 +158,6 @@
 #define IRQ_GPIO_END           (S5P_GPIOINT_BASE + S5P_GPIOINT_COUNT)
 
 /* Set the default NR_IRQS */
-#define NR_IRQS                        (IRQ_GPIO_END)
+#define NR_IRQS                        (IRQ_GPIO_END + 64)
 
 #endif /* __ASM_ARCH_IRQS_H */