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

Pull missed media updates from Mauro Carvalho Chehab:
 "It seems I screwed-up my previous pull request: it ends up that only
  half of the media patches that were in linux-next got merged in -rc1.

  The script which creates the signed tags silently failed due to
  5.19->6.0 so it ended generating a tag with incomplete stuff.

  So here are the missing parts:

   - a DVB core security fix

   - lots of fixes and cleanups for atomisp staging driver

   - old drivers that are VB1 are being moved to staging to be
     deprecated

   - several driver updates - mostly for embedded systems, but there are
     also some things addressing issues with some PC webcams, in the UVC
     video driver"

* tag 'media/v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (163 commits)
  media: sun6i-csi: Move csi buffer definition to main header file
  media: sun6i-csi: Introduce and use video helper functions
  media: sun6i-csi: Add media ops with link notify callback
  media: sun6i-csi: Remove controls handler from the driver
  media: sun6i-csi: Register the media device after creation
  media: sun6i-csi: Pass and store csi device directly in video code
  media: sun6i-csi: Tidy up video code
  media: sun6i-csi: Tidy up v4l2 code
  media: sun6i-csi: Tidy up Kconfig
  media: sun6i-csi: Use runtime pm for clocks and reset
  media: sun6i-csi: Define and use variant to get module clock rate
  media: sun6i-csi: Always set exclusive module clock rate
  media: sun6i-csi: Tidy up platform code
  media: sun6i-csi: Refactor main driver data structures
  media: sun6i-csi: Define and use driver name and (reworked) description
  media: cedrus: Add a Kconfig dependency on RESET_CONTROLLER
  media: sun8i-rotate: Add a Kconfig dependency on RESET_CONTROLLER
  media: sun8i-di: Add a Kconfig dependency on RESET_CONTROLLER
  media: sun4i-csi: Add a Kconfig dependency on RESET_CONTROLLER
  media: sun6i-csi: Add a Kconfig dependency on RESET_CONTROLLER
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/i2c/ar0521.c
Simple merge

diff --cc drivers/media/i2c/ir-kbd-i2c.c
Simple merge

diff --cc drivers/media/i2c/isl7998x.c
Simple merge

diff --cc drivers/media/i2c/mt9v111.c
Simple merge

diff --cc drivers/media/i2c/ov5640.c
index 1852e1cfc7df0ab30cb275a8ece34960aa41bb6f,94db427e21de2345c786e7f5b73e1393cebdc6d9..2d740397a5d4d6bebf5e991c35db28effe04ac84
--- 1/drivers/media/i2c/ov5640.c
--- 2/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@@ -3915,8 -3939,14 +3939,12 @@@ static void ov5640_remove(struct i2c_cl
        media_entity_cleanup(&sensor->sd.entity);
        v4l2_ctrl_handler_free(&sensor->ctrls.handler);
        mutex_destroy(&sensor->lock);
 -
 -      return 0;
  }
  
+ static const struct dev_pm_ops ov5640_pm_ops = {
+       SET_RUNTIME_PM_OPS(ov5640_sensor_suspend, ov5640_sensor_resume, NULL)
+ };
+ 
  static const struct i2c_device_id ov5640_id[] = {
        {"ov5640", 0},
        {},

diff --cc drivers/media/i2c/ov8865.c
Simple merge

diff --cc drivers/media/radio/si4713/si4713.c
Simple merge

diff --cc drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
Simple merge

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