From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Sep 2023 19:21:32 +0000 (-0700)
Subject: Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=307d59039fb26212a84a9aa6a134a7d2bdea34ca;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'media/v6.6-1' of git://git./linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new i2c drivers: ds90ub913, ds90ub953, ds90ub960, dw9719, ds90ub913

 - new Intel IVSC MEI drivers

 - some Mediatek platform drivers were moved to a common location

 - Intel atomisp2 driver is now working with the main ov2680 driver. Due
   to that, the atomisp2 ov2680 staging one was removed

 - the bttv driver was finally converted to videobuf2 framework. This
   was the last one upstream using videobuf version 1 core. We'll likely
   remove the old videobuf framework on 6.7

 - lots of improvements at atomisp driver: it now works with normal I2C
   sensors. Several compile-mode dependecies to select between ISP2400
   and ISP2401 are now solved in runtime

 - a new ipu-bridge logic was added to work with IVSC MEI drivers

 - venus driver gained better support for new VPU versions

 - the v4l core async framework has gained lots of improvements and
   cleanups

 - lots of other cleanups, improvements and driver fixes

* tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (358 commits)
  media: ivsc: Add ACPI dependency
  media: bttv: convert to vb2
  media: bttv: use audio defaults for winfast2000
  media: bttv: refactor bttv_set_dma()
  media: bttv: move vbi_skip/vbi_count out of buffer
  media: bttv: remove crop info from bttv_buffer
  media: bttv: remove tvnorm field from bttv_buffer
  media: bttv: remove format field from bttv_buffer
  media: bttv: move do_crop flag out of bttv_fh
  media: bttv: copy vbi_fmt from bttv_fh
  media: bttv: copy vid fmt/width/height from fh
  media: bttv: radio use v4l2_fh instead of bttv_fh
  media: bttv: replace BUG with WARN_ON
  media: bttv: use video_drvdata to get bttv
  media: i2c: rdacm21: Fix uninitialized value
  media: coda: Remove duplicated include
  media: vivid: fix the racy dev->radio_tx_rds_owner
  media: i2c: ccs: Check rules is non-NULL
  media: i2c: ds90ub960: Fix PLL config for 1200 MHz CSI rate
  media: i2c: ds90ub953: Fix use of uninitialized variables
  ...
---

307d59039fb26212a84a9aa6a134a7d2bdea34ca
diff --cc drivers/media/dvb-frontends/mn88443x.c
index db2921c736af,bbdd0389ffa3..7a58f53ab999
--- a/drivers/media/dvb-frontends/mn88443x.c
+++ b/drivers/media/dvb-frontends/mn88443x.c
@@@ -8,9 -8,9 +8,9 @@@
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/gpio/consumer.h>
- #include <linux/of_device.h>
+ #include <linux/of.h>
  #include <linux/regmap.h>
 -#include <media/dvb_math.h>
 +#include <linux/int_log.h>
  
  #include "mn88443x.h"
  
diff --cc drivers/media/platform/nxp/imx7-media-csi.c
index 791bde67f439,ffe372d321b6..15049c6aab37
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@@ -9,11 -9,9 +9,11 @@@
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/interrupt.h>
 +#include <linux/math.h>
  #include <linux/mfd/syscon.h>
 +#include <linux/minmax.h>
  #include <linux/module.h>
- #include <linux/of_device.h>
+ #include <linux/of.h>
  #include <linux/of_graph.h>
  #include <linux/pinctrl/consumer.h>
  #include <linux/platform_device.h>