Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / arch / arm / mach-exynos / include / mach / irqs.h

diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h
index 35bced6f9092141920152664267362a54cdf8161..1f4dc35cd4b9b88479e4b16496a7f62a05c58a46 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/irqs.h
+++ b/arch/arm/mach-exynos/include/mach/irqs.h
@@ -136,6 +136,9 @@
 #define EXYNOS4_IRQ_TSI                        IRQ_SPI(115)
 #define EXYNOS4_IRQ_SATA               IRQ_SPI(116)
 
+#define EXYNOS4_IRQ_TMU_TRIG0          COMBINER_IRQ(2, 4)
+#define EXYNOS4_IRQ_TMU_TRIG1          COMBINER_IRQ(3, 4)
+
 #define EXYNOS4_IRQ_SYSMMU_MDMA0_0     COMBINER_IRQ(4, 0)
 #define EXYNOS4_IRQ_SYSMMU_SSS_0       COMBINER_IRQ(4, 1)
 #define EXYNOS4_IRQ_SYSMMU_FIMC0_0     COMBINER_IRQ(4, 2)
@@ -259,11 +262,6 @@
 #define EXYNOS5_IRQ_IEM_IEC            IRQ_SPI(48)
 #define EXYNOS5_IRQ_IEM_APC            IRQ_SPI(49)
 #define EXYNOS5_IRQ_GPIO_C2C           IRQ_SPI(50)
-#define EXYNOS5_IRQ_UART0              IRQ_SPI(51)
-#define EXYNOS5_IRQ_UART1              IRQ_SPI(52)
-#define EXYNOS5_IRQ_UART2              IRQ_SPI(53)
-#define EXYNOS5_IRQ_UART3              IRQ_SPI(54)
-#define EXYNOS5_IRQ_UART4              IRQ_SPI(55)
 #define EXYNOS5_IRQ_IIC                        IRQ_SPI(56)
 #define EXYNOS5_IRQ_IIC1               IRQ_SPI(57)
 #define EXYNOS5_IRQ_IIC2               IRQ_SPI(58)
@@ -333,6 +331,11 @@
 #define EXYNOS5_IRQ_FIMC_LITE1         IRQ_SPI(126)
 #define EXYNOS5_IRQ_RP_TIMER           IRQ_SPI(127)
 
+/* EXYNOS5440 */
+
+#define EXYNOS5440_IRQ_UART0           IRQ_SPI(2)
+#define EXYNOS5440_IRQ_UART1           IRQ_SPI(3)
+
 #define EXYNOS5_IRQ_PMU                        COMBINER_IRQ(1, 2)
 
 #define EXYNOS5_IRQ_SYSMMU_GSC0_0      COMBINER_IRQ(2, 0)