Merge tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree into media_stage

Tag branch

* tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree:
  media: cec: seco: Drop pointless include
  media: hantro: sunxi: Fix VP9 steps
  media: imx: csis: Store pads format separately
  doc: media: Document VP9 reference_mode miss-placement
  doc: media: Document MM21 tiled format
  media: imx: imx8mq-mipi-csi2: Remove YUV422 2X8
  media: v4l2-core: Initialize h264 scaling matrix
  media: imx: imx-mipi-csis: Add output format
  media: imx: imx-mipi-csis: Add BGR888
  media: imx: imx-mipi-csis: Add RGB565_1X16
  media: imx: imx-mipi-csis: Set PIXEL_MODE for YUV422
  media: imx: imx7-media-csi: Use dual sampling for YUV 1X16
  media: imx: Rename imx7-mipi-csis.c to imx-mipi-csis.c
  media: imx: De-stage imx7-mipi-csis

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --cc Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
Simple merge

diff --cc Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/cec/platform/seco/seco-cec.c
index 78856a5,4df5609..51a6fcf
--- 1/drivers/media/cec/platform/seco/seco-cec.c
--- 2/drivers/media/cec/platform/seco/seco-cec.c
+++ b/drivers/media/cec/platform/seco/seco-cec.c
@@@ -551,9 -550,9 +550,9 @@@ static int secocec_acpi_probe(struct se
        struct gpio_desc *gpio;
        int irq = 0;
  
-       gpio = devm_gpiod_get(dev, NULL, GPIOF_IN);
+       gpio = devm_gpiod_get(dev, NULL, GPIOD_IN);
        if (IS_ERR(gpio)) {
 -              dev_err(dev, "Cannot request interrupt gpio");
 +              dev_err(dev, "Cannot request interrupt gpio\n");
                return PTR_ERR(gpio);
        }
  

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

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

diff --cc drivers/media/v4l2-core/v4l2-ctrls-core.c
index c214750,18194a1..8968cec
--- 1/drivers/media/v4l2-core/v4l2-ctrls-core.c
--- 2/drivers/media/v4l2-core/v4l2-ctrls-core.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
@@@ -112,8 -112,8 +112,9 @@@ static void std_init_compound(const str
        struct v4l2_ctrl_mpeg2_picture *p_mpeg2_picture;
        struct v4l2_ctrl_mpeg2_quantisation *p_mpeg2_quant;
        struct v4l2_ctrl_vp8_frame *p_vp8_frame;
 +      struct v4l2_ctrl_vp9_frame *p_vp9_frame;
        struct v4l2_ctrl_fwht_params *p_fwht_params;
+       struct v4l2_ctrl_h264_scaling_matrix *p_h264_scaling_matrix;
        void *p = ptr.p + idx * ctrl->elem_size;
  
        if (ctrl->p_def.p_const)

diff --cc drivers/staging/media/imx/imx8mq-mipi-csi2.c
Simple merge