From: Mauro Carvalho Chehab Date: Mon, 7 Mar 2022 15:26:54 +0000 (+0100) Subject: Merge tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree into media_stage X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c81652a4a88ce65312e56321812ae54a73dae963;p=linux.git 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 --- c81652a4a88ce65312e56321812ae54a73dae963 diff --cc drivers/media/cec/platform/seco/seco-cec.c index 78856a55e6379,4df56096a476e..51a6fcfd077df --- a/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/v4l2-core/v4l2-ctrls-core.c index c2147509b7cd9,18194a1dd8938..8968cec8454ea --- a/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)