Merge tag 'samsung-drivers-exynos-mfc-4.8' of git://git.kernel.org/pub/scm/linux...

Topic branch for Exynos MFC changes for v4.8:
Pull s5p-mfc changes from media tree so the arm/mach-exynos code
could be removed. The bindings are converted to generic reserved memory
bindings.

* tag 'samsung-drivers-exynos-mfc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Convert MFC device to generic reserved memory bindings
  ARM: EXYNOS: Remove code for MFC custom reserved memory handling
  media: s5p-mfc: add iommu support
  media: s5p-mfc: replace custom reserved memory handling code with generic one
  media: s5p-mfc: use generic reserved memory bindings
  of: reserved_mem: add support for using more than one region for given device
  media: set proper max seg size for devices on Exynos SoCs
  media: vb2-dma-contig: add helper for setting dma max seg size
  s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open()
  s5p-mfc: Add release callback for memory region devs
  s5p-mfc: Set device name for reserved memory region devs

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-exynos/Makefile
index 838249d,b91b382..9ea6c54
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -13,6 -13,7 +13,6 @@@ obj-$(CONFIG_ARCH_EXYNOS)     += exynos.o e
  
  obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o
  obj-$(CONFIG_PM_SLEEP)                += suspend.o
 -obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
  
  obj-$(CONFIG_SMP)             += platsmp.o headsmp.o
  
@@@ -22,5 -23,3 +22,3 @@@ AFLAGS_sleep.o                        :=-Wa,-march=armv7-a$(
  
  obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
  CFLAGS_mcpm-exynos.o          += -march=armv7-a
- 
- obj-$(CONFIG_S5P_DEV_MFC)     += s5p-dev-mfc.o