From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Date: Fri, 29 Jul 2016 07:38:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'media_tree/vsp1' into generic-zpos-v8
X-Git-Tag: Ubuntu-4.10.0-19.21~2800^2^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=62c2cd0f49333a2bb53602ec23039ca99a19cb9d;p=mirror_ubuntu-artful-kernel.git

Merge remote-tracking branch 'media_tree/vsp1' into generic-zpos-v8
---

62c2cd0f49333a2bb53602ec23039ca99a19cb9d
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);