Merge branch 'next/cleanup-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kerne...

* '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 <arnd@arndb.de>

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/clock-exynos4.c
Simple merge

diff --cc arch/arm/mach-exynos/clock-exynos5.c
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/irqs.h
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/map.h
index 6e6d11ff352a30b131db307b8d2910c9c0c6282b,69f2ea6fb0d2d14d7834a26def6078d8545999c8..0e2292d04550359b637d7ce011c7c7549be711ee
--- 1/arch/arm/mach-exynos/include/mach/map.h
--- 2/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

diff --cc arch/arm/mach-exynos/include/mach/regs-clock.h
Simple merge