From: Kukjin Kim Date: Sat, 12 May 2012 22:53:34 +0000 (+0900) Subject: Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=163ec0369be4c26e68385f6cec88d0ee38c8d8e5;p=linux.git Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p --- 163ec0369be4c26e68385f6cec88d0ee38c8d8e5 diff --cc arch/arm/mach-exynos/include/mach/map.h index 69f2ea6fb0d2d,6e6d11ff352a3..0e2292d045503 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@@ -89,9 -89,12 +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