Merge branch 'next/devel-samsung-iommu' into next/devel-samsung

Conflicts:
	arch/arm/mach-exynos/Makefile

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

diff --cc arch/arm/mach-exynos/Makefile
index f67e882b9dabff8dfbf3346949edfb7c21692d53,272625231c73d168599745b4624b11c47da72cee..bd7e7654a2504c36457ecfde484984c3909063cc
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -50,11 -50,10 +50,11 @@@ obj-$(CONFIG_MACH_EXYNOS5_DT)              += mach-
  obj-y                                 += dev-uart.o
  obj-$(CONFIG_ARCH_EXYNOS4)            += dev-audio.o
  obj-$(CONFIG_EXYNOS4_DEV_AHCI)                += dev-ahci.o
- obj-$(CONFIG_EXYNOS_DEV_DRM)          += dev-drm.o
- obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)      += dev-sysmmu.o
 -obj-$(CONFIG_EXYNOS_DEV_SYSMMU)               += dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)               += dev-dwmci.o
  obj-$(CONFIG_EXYNOS4_DEV_DMA)         += dma.o
  obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)    += dev-ohci.o
++obj-$(CONFIG_EXYNOS_DEV_DRM)          += dev-drm.o
++obj-$(CONFIG_EXYNOS_DEV_SYSMMU)               += dev-sysmmu.o
  
  obj-$(CONFIG_ARCH_EXYNOS)             += setup-i2c0.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)      += setup-fimc.o

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

diff --cc arch/arm/plat-samsung/include/plat/devs.h
index 62e6251e4b19839806e7af4d0073c384b1812f15,4067d1dd7f1c3e067b41ebb6963b5c1226994db0..61ca2f356c52d6d4ea3fac036788cc422aa02235
--- 1/arch/arm/plat-samsung/include/plat/devs.h
--- 2/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@@ -133,10 -133,7 +133,9 @@@ extern struct platform_device exynos4_d
  extern struct platform_device exynos4_device_pcm2;
  extern struct platform_device exynos4_device_pd[];
  extern struct platform_device exynos4_device_spdif;
- extern struct platform_device exynos4_device_sysmmu;
  
 +extern struct platform_device exynos_device_drm;
 +
  extern struct platform_device samsung_asoc_dma;
  extern struct platform_device samsung_asoc_idma;
  extern struct platform_device samsung_device_keypad;