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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/usb/uvc/uvc_v4l2.c
Simple merge

diff --cc drivers/of/of_reserved_mem.c
Simple merge

diff --cc include/linux/of_reserved_mem.h
index c201060,1779cda..f8e1992
--- 1/include/linux/of_reserved_mem.h
--- 2/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);