From: Arnd Bergmann Date: Mon, 14 May 2012 19:14:43 +0000 (+0200) Subject: Merge branch 'exynos/sysmmu' into next/cleanup2 X-Git-Tag: firefly_0821_release~3680^2~2750^2~1 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=eedd52e3c462d5434412fd0b7bc183ed76d3a4a8;p=firefly-linux-kernel-4.4.55.git Merge branch 'exynos/sysmmu' into next/cleanup2 Required as a depdency for the next/cleanup-plat-s3c24xx-s5p branch Signed-off-by: Arnd Bergmann --- eedd52e3c462d5434412fd0b7bc183ed76d3a4a8 diff --cc arch/arm/mach-exynos/include/mach/map.h index 6e6d11ff352a,69f2ea6fb0d2..0e2292d04550 --- 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