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

Pull media updates from Mauro Carvalho Chehab:

 - Removal of several VB1-only deprecated drivers: cpia2, fsl-viu, meye,
   stkwebcam, tm6000, vpfe_capture and zr364xx

 - saa7146 recovered from staging/deprecated. We opted to give ti a
   chance, and, instead of deprecating it, the intention is to write
   patches migrating it from VB1 to VB2.

 - av7110 returned from staging/deprecated/ to staging/ as we're not
   planning on dropping it any time soon

 - media controller API has gained experimental support for G_ROUTING
   and streams API. No drivers use it right now. We're planning to add
   one after -rc1, giving some time to experience the API and eventually
   have changes during the next development cycle

 - New sensor drivers: imx296, imx415, ov8858

 - Atomisp had lots of changes, specially on its sensor's interface,
   making atomisp sensor drivers closer to normal sensor drivers

 - media controller kAPI has gained some helpers to traverse pipelines

 - uvcvideo now better support power line control

 - lots of bug fixes, cleanups and driver improvements

* tag 'media/v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (296 commits)
  media: imx-mipi-csis: Check csis_fmt validity before use
  media: v4l2-subdev.c: clear stream field
  media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line
  media: Revert "media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci"
  media: Revert "media: av7110: move to staging/media/deprecated/saa7146"
  media: imx-pxp: convert to regmap
  media: imx-pxp: Use non-threaded IRQ
  media: imx-pxp: Introduce pxp_read() and pxp_write() wrappers
  media: imx-pxp: Implement frame size enumeration
  media: imx-pxp: Pass pixel format value to find_format()
  media: imx-pxp: Add media controller support
  media: imx-pxp: Don't set bus_info manually in .querycap()
  media: imx-pxp: Sort headers alphabetically
  media: imx-pxp: add support for i.MX7D
  media: imx-pxp: make data_path_ctrl0 platform dependent
  media: imx-pxp: disable LUT block
  media: imx-pxp: explicitly disable unused blocks
  media: imx-pxp: extract helper function to setup data path
  media: imx-pxp: detect PXP version
  media: dt-bindings: media: fsl-pxp: convert to yaml
  ...

diff --cc Documentation/admin-guide/media/platform-cardlist.rst
Simple merge

diff --cc Documentation/admin-guide/media/v4l-drivers.rst
index 734e18c310bdef39738e45d8bf8e9cc90ed71b15,aa5dcbae077ea3f78b545e8992a7333f9df34cdd..1c41f87c391717e770f7df4d0007427c9c13cf3e
--- 1/Documentation/admin-guide/media/v4l-drivers.rst
--- 2/Documentation/admin-guide/media/v4l-drivers.rst
+++ b/Documentation/admin-guide/media/v4l-drivers.rst
@@@ -11,8 -11,8 +11,7 @@@ Video4Linux (V4L) driver-specific docum
  
        bttv
        cafe_ccic
-       cpia2
        cx88
 -      davinci-vpbe
        fimc
        imx
        imx7

diff --cc Documentation/driver-api/media/drivers/index.rst
index 3c17d48f83c0b0f407331ac017d3b33659e136f5,61d64366ab516733217f166bb3fc5eae4642ab07..c4123a16b5f9c927eab9fb8faef497a421bbb2e4
--- 1/Documentation/driver-api/media/drivers/index.rst
--- 2/Documentation/driver-api/media/drivers/index.rst
+++ b/Documentation/driver-api/media/drivers/index.rst
@@@ -13,9 -13,9 +13,8 @@@ Video4Linux (V4L) driver
        :maxdepth: 5
  
        bttv-devel
-       cpia2_devel
        cx2341x-devel
        cx88-devel
 -      davinci-vpbe-devel
        fimc-devel
        pvrusb2
        pxa_camera

diff --cc Documentation/driver-api/media/v4l2-subdev.rst
Simple merge

diff --cc MAINTAINERS
index eb223dcf0f62f19d936db3a3b4a75b59ecc049ea,7f4678dba495516af7dcaa3eaefad7af80bc5fee..a86c34469e10adf3dbacc4a3facb989912ac09ee
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14106,23 -14156,6 +14105,16 @@@ F: drivers/regulator/mpq7920.
  F:    drivers/regulator/mpq7920.h
  F:    include/linux/mfd/mp2629.h
  
- MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
- S:    Orphan
- W:    http://popies.net/meye/
- F:    Documentation/userspace-api/media/drivers/meye*
- F:    drivers/staging/media/deprecated/meye/
- F:    include/uapi/linux/meye.h
- 
 +MOST(R) TECHNOLOGY DRIVER
 +M:    Parthiban Veerasooran <parthiban.veerasooran@microchip.com>
 +M:    Christian Gromm <christian.gromm@microchip.com>
 +S:    Maintained
 +F:    Documentation/ABI/testing/configfs-most
 +F:    Documentation/ABI/testing/sysfs-bus-most
 +F:    drivers/most/
 +F:    drivers/staging/most/
 +F:    include/linux/most.h
 +
  MOTORCOMM PHY DRIVER
  M:    Peter Geis <pgwipeout@gmail.com>
  M:    Frank <Frank.Sae@motor-comm.com>

diff --cc drivers/media/common/Kconfig
Simple merge

diff --cc drivers/media/common/Makefile
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-subdev.c
index 6630fb30bc7d4fdd43cc52222773140ffbd3be16,dff1d9be7841da385955c12a35d1e9781a212842..b10045c02f4343250f98ec668fd9d6cb4f9cd087
--- 1/drivers/media/v4l2-core/v4l2-subdev.c
--- 2/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@@ -8,24 -8,41 +8,44 @@@
   *        Sakari Ailus <sakari.ailus@iki.fi>
   */
  
+ #include <linux/export.h>
  #include <linux/ioctl.h>
 +#include <linux/leds.h>
  #include <linux/mm.h>
  #include <linux/module.h>
+ #include <linux/overflow.h>
  #include <linux/slab.h>
  #include <linux/types.h>
- #include <linux/videodev2.h>
- #include <linux/export.h>
  #include <linux/version.h>
+ #include <linux/videodev2.h>
  
  #include <media/v4l2-ctrls.h>
  #include <media/v4l2-device.h>
- #include <media/v4l2-ioctl.h>
- #include <media/v4l2-fh.h>
  #include <media/v4l2-event.h>
+ #include <media/v4l2-fh.h>
+ #include <media/v4l2-ioctl.h>
+ 
+ #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
+ /*
+  * The Streams API is an experimental feature. To use the Streams API, set
+  * 'v4l2_subdev_enable_streams_api' to 1 below.
+  */
+ 
+ static bool v4l2_subdev_enable_streams_api;
+ #endif
+ 
+ /*
+  * Maximum stream ID is 63 for now, as we use u64 bitmask to represent a set
+  * of streams.
+  *
+  * Note that V4L2_FRAME_DESC_ENTRY_MAX is related: V4L2_FRAME_DESC_ENTRY_MAX
+  * restricts the total number of streams in a pad, although the stream ID is
+  * not restricted.
+  */
+ #define V4L2_SUBDEV_MAX_STREAM_ID 63
  
 +#include "v4l2-subdev-priv.h"
 +
  #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
  static int subdev_fh_init(struct v4l2_subdev_fh *fh, struct v4l2_subdev *sd)
  {

diff --cc include/media/v4l2-subdev.h
Simple merge