From: Kukjin Kim Date: Tue, 15 May 2012 06:55:25 +0000 (+0900) Subject: Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1 X-Git-Tag: v3.5-rc1~68^2~1^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f58487b1e313e6abf500431e05f4d54f61736f2;p=karo-tx-linux.git Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1 --- 0f58487b1e313e6abf500431e05f4d54f61736f2 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