Merge tag 'media/v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:

 - a new sensor driver for ov5675

 - a new platform driver for Allwinner A10 sensor interface

 - some new remote controller keymaps

 - some cosmetic changes at V4L2 core in order to avoid #ifdefs and to
   merge two core modules into one

 - removal of bcm2048 radio driver from staging

 - removal of davinci_vpfe video driver from staging

 - regression fix since Kernel 5.1 at the legacy VideoBuffer version 1
   core

 - added some documentation for remote controller protocols

 - pixel format documentation was split on two files

 - lots of other driver improvements and cleanups

* tag 'media/v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (321 commits)
  media: videobuf-core.c: poll_wait needs a non-NULL buf pointer
  media: sun4i: Make sun4i_csi_formats static
  media: imx: remove unused including <linux/version.h>
  media: stm32-dcmi: Delete an unnecessary of_node_put() call in dcmi_probe()
  media: pvrusb2: qctrl.flag will be uninitlaized if cx2341x_ctrl_query() returns error code
  media: em28xx: Fix exception handling in em28xx_alloc_urbs()
  media: don't do a 31 bit shift on a signed int
  media: use the BIT() macro
  media: ov9650: add a sanity check
  media: aspeed-video: address a protential usage of an unitialized var
  media: vicodec: make life easier for static analyzers
  media: remove include stdarg.h from some drivers
  v4l2-core: fix coding style for the two new c files
  media: v4l2-core: Remove BUG() from i2c and spi helpers
  media: v4l2-core: introduce a helper to unregister a i2c subdev
  media: v4l2-core: introduce a helper to unregister a spi subdev
  media: v4l2-core: move i2c helpers out of v4l2-common.c
  media: v4l2-core: move spi helpers out of v4l2-common.c
  media: v4l2-core: Module re-organization
  media: usbvision: Remove dead code
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/platform/omap/omap_vout_vrfb.c
index 11ec048929e80109e6702249aea0b345e79378d3,239871c4539df0ab6e24d28878b709415ca90ae7..6bd672cbdb6230a7ae03bead8b7944feae75579f
--- 1/drivers/media/platform/omap/omap_vout_vrfb.c
--- 2/drivers/media/platform/omap/omap_vout_vrfb.c
+++ b/drivers/media/platform/omap/omap_vout_vrfb.c
@@@ -253,10 -251,11 +251,10 @@@ int omap_vout_prepare_vrfb(struct omap_
         */
  
        pixsize = vout->bpp * vout->vrfb_bpp;
 -      dst_icg = ((MAX_PIXELS_PER_LINE * pixsize) -
 -                (vout->pix.width * vout->bpp)) + 1;
 +      dst_icg = MAX_PIXELS_PER_LINE * pixsize - vout->pix.width * vout->bpp;
  
-       xt->src_start = vout->buf_phy_addr[vb->i];
-       xt->dst_start = vout->vrfb_context[vb->i].paddr[0];
+       xt->src_start = buf_phy_addr;
+       xt->dst_start = vout->vrfb_context[vb->index].paddr[0];
  
        xt->numf = vout->pix.height;
        xt->frame_size = 1;