From: Arnd Bergmann Date: Tue, 15 May 2012 14:50:36 +0000 (+0200) Subject: Merge branch 'exynos/iommu' into next/soc2 X-Git-Tag: v3.5-rc1~68^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d0c872ab4fbef94cf06e53e7a7b06357459e21b;p=platform%2Fkernel%2Flinux-3.10.git Merge branch 'exynos/iommu' into next/soc2 This is a dependency for the following samsung changes. Signed-off-by: Arnd Bergmann --- 3d0c872ab4fbef94cf06e53e7a7b06357459e21b diff --cc arch/arm/mach-exynos/include/mach/map.h index 6e6d11f,69f2ea6..0e2292d --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@@ -89,12 -89,9 +89,13 @@@ #define EXYNOS4_PA_MDMA1 0x12840000 #define EXYNOS4_PA_PDMA0 0x12680000 #define EXYNOS4_PA_PDMA1 0x12690000 +#define EXYNOS5_PA_MDMA0 0x10800000 +#define EXYNOS5_PA_MDMA1 0x11C10000 +#define EXYNOS5_PA_PDMA0 0x121A0000 +#define EXYNOS5_PA_PDMA1 0x121B0000 #define EXYNOS4_PA_SYSMMU_MDMA 0x10A40000 + #define EXYNOS4_PA_SYSMMU_2D_ACP 0x10A40000 #define EXYNOS4_PA_SYSMMU_SSS 0x10A50000 #define EXYNOS4_PA_SYSMMU_FIMC0 0x11A20000 #define EXYNOS4_PA_SYSMMU_FIMC1 0x11A30000