From: Olof Johansson <olof@lixom.net>
Date: Wed, 6 Jul 2016 05:46:39 +0000 (-0700)
Subject: Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.8-rc1~66^2~16
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=8fe9c8b750ca294882b163100817f97866990481

Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git./linux/kernel/git/krzk/linux into next/dt

Topic branch for Exynos MFC changes for v4.8, part 2:

Replace hardcoded reserved memory ranges with auto-allocated ones
and enable MFC for all boards.

* tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: enable MFC device for all boards
  ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi
  ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones
  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>
---

8fe9c8b750ca294882b163100817f97866990481
diff --cc arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 3f9c1a9ff0bb,530883c1a407..d56253049ccb
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@@ -18,6 -16,8 +18,7 @@@
  #include <dt-bindings/sound/samsung-i2s.h>
  #include "exynos5800.dtsi"
  #include "exynos5422-cpus.dtsi"
 -#include "exynos5422-cpu-thermal.dtsi"
+ #include "exynos-mfc-reserved-memory.dtsi"
  
  / {
  	memory {
diff --cc include/linux/of_reserved_mem.h
index c201060e0c6d,1779cda99ef7..f8e1992d6423
--- a/include/linux/of_reserved_mem.h
+++ b/include/linux/of_reserved_mem.h
@@@ -28,16 -29,11 +29,18 @@@ typedef int (*reservedmem_of_init_fn)(s
  	_OF_DECLARE(reservedmem, name, compat, init, reservedmem_of_init_fn)
  
  #ifdef CONFIG_OF_RESERVED_MEM
- int of_reserved_mem_device_init(struct device *dev);
+ 
+ int of_reserved_mem_device_init_by_idx(struct device *dev,
+ 				       struct device_node *np, int idx);
  void of_reserved_mem_device_release(struct device *dev);
  
 +int early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
 +					     phys_addr_t align,
 +					     phys_addr_t start,
 +					     phys_addr_t end,
 +					     bool nomap,
 +					     phys_addr_t *res_base);
 +
  void fdt_init_reserved_mem(void);
  void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
  			       phys_addr_t base, phys_addr_t size);