diff options
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/irqs.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/map.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h index e2995be40c3f..934d2a493982 100644 --- a/arch/arm/mach-exynos4/include/mach/irqs.h +++ b/arch/arm/mach-exynos4/include/mach/irqs.h | |||
@@ -138,6 +138,10 @@ | |||
138 | #define IRQ_SYSMMU_MFC_M1_0 COMBINER_IRQ(5, 6) | 138 | #define IRQ_SYSMMU_MFC_M1_0 COMBINER_IRQ(5, 6) |
139 | #define IRQ_SYSMMU_PCIE_0 COMBINER_IRQ(5, 7) | 139 | #define IRQ_SYSMMU_PCIE_0 COMBINER_IRQ(5, 7) |
140 | 140 | ||
141 | #define IRQ_FIMD0_FIFO COMBINER_IRQ(11, 0) | ||
142 | #define IRQ_FIMD0_VSYNC COMBINER_IRQ(11, 1) | ||
143 | #define IRQ_FIMD0_SYSTEM COMBINER_IRQ(11, 2) | ||
144 | |||
141 | #define MAX_COMBINER_NR 16 | 145 | #define MAX_COMBINER_NR 16 |
142 | 146 | ||
143 | #define IRQ_ADC IRQ_ADC0 | 147 | #define IRQ_ADC IRQ_ADC0 |
diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h index 0aa77fb707d2..44b796926f53 100644 --- a/arch/arm/mach-exynos4/include/mach/map.h +++ b/arch/arm/mach-exynos4/include/mach/map.h | |||
@@ -95,6 +95,8 @@ | |||
95 | #define EXYNOS4_PA_MIPI_CSIS0 0x11880000 | 95 | #define EXYNOS4_PA_MIPI_CSIS0 0x11880000 |
96 | #define EXYNOS4_PA_MIPI_CSIS1 0x11890000 | 96 | #define EXYNOS4_PA_MIPI_CSIS1 0x11890000 |
97 | 97 | ||
98 | #define EXYNOS4_PA_FIMD0 0x11C00000 | ||
99 | |||
98 | #define EXYNOS4_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) | 100 | #define EXYNOS4_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) |
99 | #define EXYNOS4_PA_DWMCI 0x12550000 | 101 | #define EXYNOS4_PA_DWMCI 0x12550000 |
100 | 102 | ||
@@ -148,6 +150,7 @@ | |||
148 | #define S5P_PA_FIMC3 EXYNOS4_PA_FIMC3 | 150 | #define S5P_PA_FIMC3 EXYNOS4_PA_FIMC3 |
149 | #define S5P_PA_MIPI_CSIS0 EXYNOS4_PA_MIPI_CSIS0 | 151 | #define S5P_PA_MIPI_CSIS0 EXYNOS4_PA_MIPI_CSIS0 |
150 | #define S5P_PA_MIPI_CSIS1 EXYNOS4_PA_MIPI_CSIS1 | 152 | #define S5P_PA_MIPI_CSIS1 EXYNOS4_PA_MIPI_CSIS1 |
153 | #define S5P_PA_FIMD0 EXYNOS4_PA_FIMD0 | ||
151 | #define S5P_PA_ONENAND EXYNOS4_PA_ONENAND | 154 | #define S5P_PA_ONENAND EXYNOS4_PA_ONENAND |
152 | #define S5P_PA_ONENAND_DMA EXYNOS4_PA_ONENAND_DMA | 155 | #define S5P_PA_ONENAND_DMA EXYNOS4_PA_ONENAND_DMA |
153 | #define S5P_PA_SDRAM EXYNOS4_PA_SDRAM | 156 | #define S5P_PA_SDRAM EXYNOS4_PA_SDRAM |