Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 62c5175..92fc6c7 100644 (file)
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -17,22 +17,6 @@
 
 /* VIC0: System, DMA, Timer */
 
-#define IRQ_EINT0              S5P_IRQ_VIC0(0)
-#define IRQ_EINT1              S5P_IRQ_VIC0(1)
-#define IRQ_EINT2              S5P_IRQ_VIC0(2)
-#define IRQ_EINT3              S5P_IRQ_VIC0(3)
-#define IRQ_EINT4              S5P_IRQ_VIC0(4)
-#define IRQ_EINT5              S5P_IRQ_VIC0(5)
-#define IRQ_EINT6              S5P_IRQ_VIC0(6)
-#define IRQ_EINT7              S5P_IRQ_VIC0(7)
-#define IRQ_EINT8              S5P_IRQ_VIC0(8)
-#define IRQ_EINT9              S5P_IRQ_VIC0(9)
-#define IRQ_EINT10             S5P_IRQ_VIC0(10)
-#define IRQ_EINT11             S5P_IRQ_VIC0(11)
-#define IRQ_EINT12             S5P_IRQ_VIC0(12)
-#define IRQ_EINT13             S5P_IRQ_VIC0(13)
-#define IRQ_EINT14             S5P_IRQ_VIC0(14)
-#define IRQ_EINT15             S5P_IRQ_VIC0(15)
 #define IRQ_EINT16_31          S5P_IRQ_VIC0(16)
 #define IRQ_BATF               S5P_IRQ_VIC0(17)
 #define IRQ_MDMA               S5P_IRQ_VIC0(18)
@@ -134,13 +118,25 @@
 #define IRQ_MDNIE3             S5P_IRQ_VIC3(8)
 #define IRQ_VIC_END            S5P_IRQ_VIC3(31)
 
-#define S5P_IRQ_EINT_BASE      (IRQ_VIC_END + 1)
+#define S5P_EINT_16_31_BASE    (IRQ_VIC_END + 1)
 
-#define S5P_EINT(x)            ((x) + S5P_IRQ_EINT_BASE)
-#define IRQ_EINT(x)            S5P_EINT(x)
+#define EINT_MODE              S3C_GPIO_SFN(0xf)
+
+#define IRQ_EINT(x)            ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \
+                                       : ((x) + S5P_EINT_16_31_BASE))
 
 /* Set the default NR_IRQS */
 
-#define NR_IRQS                (IRQ_EINT(31) + 1)
+#define NR_IRQS                        (IRQ_EINT(31) + 1)
+
+#define EINT_GPIO_0(x)         S5PV210_GPH0(x)
+#define EINT_GPIO_1(x)         S5PV210_GPH1(x)
+#define EINT_GPIO_2(x)         S5PV210_GPH2(x)
+#define EINT_GPIO_3(x)         S5PV210_GPH3(x)
+
+/* Compatibility */
+#define IRQ_LCD_FIFO           IRQ_LCD0
+#define IRQ_LCD_VSYNC          IRQ_LCD1
+#define IRQ_LCD_SYSTEM         IRQ_LCD2
 
 #endif /* ASM_ARCH_IRQS_H */