From: Arnd Bergmann Date: Mon, 14 May 2012 19:12:49 +0000 (+0200) Subject: Merge branch 'next/cleanup-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kerne... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0200c0a66cb727fae13bcd938d44a0841a6530d1;p=linux-beck.git Merge branch 'next/cleanup-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers * 'next/cleanup-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Change System MMU platform device definitions S5P: SYSMMU: Remove System MMU device driver Signed-off-by: Arnd Bergmann --- 0200c0a66cb727fae13bcd938d44a0841a6530d1 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