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

0cdee263 · Linus Torvalds <[email protected]> · 2025-07-31 13:16:09 -07:00

Pull media updates from Mauro Carvalho Chehab:

 - v4l2 core:
     - sub-device framework routing improvements
     - NV12M tiled variants added to v4l2_format_info
     - some fixes at control handler freeing logic
     - fixed H264 SEPARATE_COLOUR_PLANE check

 - new staging driver: Intel IPU7 PCI

 - Rockchip video decoder driver got promoted from staging

 - iris: added HEVC/VP9 encoder/decoder support

 - vsp1: driver has gained Renesas VSPX support

 - uvc:
     - switched to vb2 ioctl helpers
     - added MSXU 1.5 metadata support

 - atomisp: GC0310 sensor driver cleanups in preparation for moving it
   out of staging

 - Lots of cleanup, fixes and improvements

* tag 'media/v6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (310 commits)
  media: rkvdec: Unstage the driver
  media: rkvdec: Remove TODO file
  media: dt-bindings: rockchip: Add RK3576 Video Decoder bindings
  media: dt-bindings: rockchip: Document RK3588 Video Decoder bindings
  media: amphion: Support dmabuf and v4l2 buffer without binding
  media: verisilicon: postproc: 4K support
  media: v4l2: Add support for NV12M tiled variants to v4l2_format_info()
  media: uvcvideo: Use a count variable for meta_formats instead of 0 terminating
  media: uvcvideo: Auto-set UVC_QUIRK_MSXU_META
  media: uvcvideo: Introduce V4L2_META_FMT_UVC_MSXU_1_5
  media: uvcvideo: Introduce dev->meta_formats
  media: Documentation: Add note about UVCH length field
  media: uvcvideo: Do not mark valid metadata as invalid
  media: uvcvideo: uvc_v4l2_unlocked_ioctl: Invert PM logic
  media: core: export v4l2_translate_cmd
  media: uvcvideo: Turn on the camera if V4L2_EVENT_SUB_FL_SEND_INITIAL
  media: uvcvideo: Remove stream->is_streaming field
  media: uvcvideo: Split uvc_stop_streaming()
  media: uvcvideo: Handle locks in uvc_queue_return_buffers
  media: uvcvideo: Use vb2 ioctl and fop helpers
  ...

Commit: 0cdee263bc5e7b20f657ea09f9272f50c568f35b
Parents: 27152608 · d968e50b

Merge commit. Changes below are compared with the first parent: 27152608.

Changes

314 files changed · +23131 −4600

File	Status	Add	Del	Content
.mailmap	modified	+3	−2	View file
Documentation/devicetree/bindings/media/cdns,csi2rx.yaml	modified	+8	−0	View file
Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml	added	+42	−0	View file
Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml	added	+117	−0	View file
Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml	added	+106	−0	View file
Documentation/devicetree/bindings/media/fsl-vdoa.txt	deleted	+0	−21	View before deletion
Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml	modified	+5	−8	View file
Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml	modified	+9	−0	View file
Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml	modified	+3	−1	View file
Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml	modified	+16	−13	View file
Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml	modified	+3	−1	View file
Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml	modified	+25	−3	View file
Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml	modified	+34	−4	View file
Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml	modified	+7	−7	View file
Documentation/devicetree/bindings/media/renesas,fcp.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/media/renesas,vsp1.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/media/rockchip,vdec.yaml	modified	+77	−3	View file
Documentation/driver-api/media/v4l2-controls.rst	modified	+3	−6	View file
Documentation/userspace-api/media/cec/cec-pin-error-inj.rst	modified	+42	−0	View file
Documentation/userspace-api/media/v4l/biblio.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst	modified	+2	−2	View file
Documentation/userspace-api/media/v4l/ext-ctrls-fm-rx.rst	modified	+3	−8	View file
Documentation/userspace-api/media/v4l/ext-ctrls-fm-tx.rst	modified	+7	−14	View file
Documentation/userspace-api/media/v4l/meta-formats.rst	modified	+1	−0	View file
Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst	added	+23	−0	View file
Documentation/userspace-api/media/v4l/metafmt-uvc.rst	modified	+3	−1	View file
Documentation/userspace-api/media/v4l/pixfmt-bayer.rst	modified	+1	−0	View file
Documentation/userspace-api/media/v4l/pixfmt-rawnn-cru.rst	added	+143	−0	View file
Documentation/userspace-api/media/v4l/pixfmt-srggb12p.rst	modified	+2	−2	View file
Documentation/userspace-api/media/v4l/pixfmt-srggb14p.rst	modified	+1	−1	View file
MAINTAINERS	modified	+31	−1	View file
drivers/media/cec/core/cec-pin-error-inj.c	modified	+58	−1	View file
drivers/media/cec/core/cec-pin-priv.h	modified	+8	−0	View file
drivers/media/cec/core/cec-pin.c	modified	+30	−1	View file
drivers/media/cec/platform/cec-gpio/cec-gpio.c	modified	+30	−28	View file
drivers/media/cec/usb/rainshadow/rainshadow-cec.c	modified	+2	−1	View file
drivers/media/common/b2c2/flexcop-i2c.c	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2820r_core.c	modified	+3	−3	View file
drivers/media/dvb-frontends/dib7000p.c	modified	+8	−0	View file
drivers/media/i2c/Kconfig	modified	+14	−27	View file
drivers/media/i2c/adv7180.c	modified	+0	−16	View file
drivers/media/i2c/adv748x/adv748x-afe.c	modified	+0	−17	View file
drivers/media/i2c/adv748x/adv748x-hdmi.c	modified	+0	−10	View file
drivers/media/i2c/adv7604.c	modified	+2	−2	View file
drivers/media/i2c/ds90ub913.c	modified	+3	−11	View file
drivers/media/i2c/ds90ub953.c	modified	+5	−14	View file
drivers/media/i2c/ds90ub960.c	modified	+0	−8	View file
drivers/media/i2c/dw9714.c	modified	+45	−17	View file
drivers/media/i2c/hi556.c	modified	+42	−31	View file
drivers/media/i2c/imx214.c	modified	+200	−63	View file
drivers/media/i2c/imx290.c	modified	+0	−1	View file
drivers/media/i2c/imx415.c	modified	+1	−1	View file
drivers/media/i2c/lt6911uxe.c	modified	+1	−1	View file
drivers/media/i2c/max9286.c	modified	+4	−4	View file
drivers/media/i2c/max96714.c	modified	+0	−7	View file
drivers/media/i2c/max96717.c	modified	+5	−6	View file
drivers/media/i2c/mt9m114.c	modified	+103	−68	View file
drivers/media/i2c/ov2659.c	modified	+2	−1	View file
drivers/media/i2c/ov2740.c	modified	+7	−11	View file
drivers/media/i2c/ov5670.c	modified	+7	−2	View file
drivers/media/i2c/ov5693.c	modified	+6	−1	View file
drivers/media/i2c/ov7251.c	modified	+6	−1	View file
drivers/media/i2c/ov8865.c	modified	+2	−1	View file
drivers/media/i2c/saa7115.c	modified	+2	−10	View file
drivers/media/i2c/tc358743.c	modified	+89	−49	View file
drivers/media/i2c/tda1997x.c	modified	+2	−2	View file
drivers/media/i2c/vd55g1.c	modified	+16	−16	View file
drivers/media/pci/cx18/cx18-av-vbi.c	modified	+2	−10	View file
drivers/media/pci/cx18/cx18-driver.h	modified	+0	−12	View file
drivers/media/pci/cx18/cx18-fileops.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-ioctl.c	modified	+1	−1	View file
drivers/media/pci/intel/ipu-bridge.c	modified	+10	−3	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.c	modified	+32	−50	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.h	modified	+0	−2	View file
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c	modified	+6	−6	View file
drivers/media/pci/intel/ipu6/ipu6-isys.h	modified	+1	−1	View file
drivers/media/pci/intel/ivsc/mei_ace.c	modified	+3	−1	View file
drivers/media/pci/intel/ivsc/mei_csi.c	modified	+3	−1	View file
drivers/media/pci/mgb4/mgb4_vout.c	modified	+8	−1	View file
drivers/media/pci/saa7164/saa7164-buffer.c	modified	+0	−20	View file
drivers/media/pci/saa7164/saa7164-cmd.c	modified	+0	−28	View file
drivers/media/pci/saa7164/saa7164.h	modified	+0	−2	View file
drivers/media/pci/solo6x10/solo6x10-gpio.c	modified	+5	−17	View file
drivers/media/platform/amphion/vdec.c	modified	+249	−45	View file
drivers/media/platform/amphion/vpu.h	modified	+5	−2	View file
drivers/media/platform/amphion/vpu_color.c	modified	+0	−73	View file
drivers/media/platform/amphion/vpu_dbg.c	modified	+14	−1	View file
drivers/media/platform/amphion/vpu_defs.h	modified	+12	−0	View file
drivers/media/platform/amphion/vpu_helpers.c	modified	+123	−0	View file
drivers/media/platform/amphion/vpu_helpers.h	modified	+7	−5	View file
drivers/media/platform/amphion/vpu_malone.c	modified	+4	−1	View file
drivers/media/platform/amphion/vpu_mbox.c	modified	+0	−4	View file
drivers/media/platform/amphion/vpu_mbox.h	modified	+0	−1	View file
drivers/media/platform/amphion/vpu_v4l2.c	modified	+11	−0	View file
drivers/media/platform/cadence/cdns-csi2rx.c	modified	+131	−0	View file
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c	modified	+36	−11	View file
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h	modified	+1	−0	View file
drivers/media/platform/nxp/imx-mipi-csis.c	modified	+25	−43	View file
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c	modified	+66	−69	View file
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h	modified	+3	−3	View file
drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c	modified	+8	−10	View file
drivers/media/platform/nxp/imx8mq-mipi-csi2.c	modified	+155	−14	View file
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c	modified	+1	−2	View file
drivers/media/platform/qcom/camss/camss-csiphy.c	modified	+0	−5	View file
drivers/media/platform/qcom/camss/camss-csiphy.h	modified	+0	−1	View file
drivers/media/platform/qcom/camss/camss-video.c	modified	+25	−14	View file
drivers/media/platform/qcom/camss/camss.c	modified	+53	−54	View file
drivers/media/platform/qcom/iris/iris_buffer.c	modified	+31	−4	View file
drivers/media/platform/qcom/iris/iris_buffer.h	modified	+2	−1	View file
drivers/media/platform/qcom/iris/iris_ctrls.c	modified	+25	−10	View file
drivers/media/platform/qcom/iris/iris_hfi_common.h	modified	+1	−0	View file
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c	modified	+29	−19	View file
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h	modified	+4	−1	View file
drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c	modified	+28	−9	View file
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c	modified	+126	−17	View file
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h	modified	+5	−0	View file
drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c	modified	+47	−9	View file
drivers/media/platform/qcom/iris/iris_hfi_queue.c	modified	+1	−1	View file
drivers/media/platform/qcom/iris/iris_instance.h	modified	+6	−0	View file
drivers/media/platform/qcom/iris/iris_platform_common.h	modified	+21	−7	View file
drivers/media/platform/qcom/iris/iris_platform_gen2.c	modified	+174	−24	View file
drivers/media/platform/qcom/iris/iris_platform_qcs8300.h	modified	+101	−25	View file
drivers/media/platform/qcom/iris/iris_platform_sm8250.c	modified	+3	−12	View file
drivers/media/platform/qcom/iris/iris_probe.c	modified	+1	−1	View file
drivers/media/platform/qcom/iris/iris_state.c	modified	+1	−1	View file
drivers/media/platform/qcom/iris/iris_state.h	modified	+1	−0	View file
drivers/media/platform/qcom/iris/iris_vb2.c	modified	+10	−8	View file
drivers/media/platform/qcom/iris/iris_vdec.c	modified	+72	−44	View file
drivers/media/platform/qcom/iris/iris_vdec.h	modified	+11	−0	View file
drivers/media/platform/qcom/iris/iris_vidc.c	modified	+31	−5	View file
drivers/media/platform/qcom/iris/iris_vpu_buffer.c	modified	+386	−11	View file
drivers/media/platform/qcom/iris/iris_vpu_buffer.h	modified	+43	−3	View file
drivers/media/platform/qcom/venus/core.c	modified	+9	−9	View file
drivers/media/platform/qcom/venus/core.h	modified	+2	−0	View file
drivers/media/platform/qcom/venus/hfi_msgs.c	modified	+58	−25	View file
drivers/media/platform/qcom/venus/hfi_venus.c	modified	+5	−0	View file
drivers/media/platform/qcom/venus/pm_helpers.c	modified	+34	−24	View file
drivers/media/platform/qcom/venus/vdec.c	modified	+3	−5	View file
drivers/media/platform/qcom/venus/venc.c	modified	+3	−5	View file
drivers/media/platform/raspberrypi/pisp_be/Kconfig	modified	+1	−0	View file
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c	modified	+104	−103	View file
drivers/media/platform/raspberrypi/rp1-cfe/cfe.c	modified	+1	−3	View file
drivers/media/platform/renesas/rcar-csi2.c	modified	+290	−46	View file
drivers/media/platform/renesas/rcar-fcp.c	modified	+36	−0	View file
drivers/media/platform/renesas/rcar-vin/rcar-core.c	modified	+269	−425	View file
drivers/media/platform/renesas/rcar-vin/rcar-dma.c	modified	+33	−44	View file
drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c	modified	+20	−472	View file
drivers/media/platform/renesas/rcar-vin/rcar-vin.h	modified	+4	−12	View file
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c	modified	+3	−3	View file
drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h	modified	+9	−5	View file
drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c	modified	+32	−13	View file
drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c	modified	+89	−19	View file
drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c	modified	+29	−13	View file
drivers/media/platform/renesas/vsp1/Makefile	modified	+1	−0	View file
drivers/media/platform/renesas/vsp1/vsp1.h	modified	+1	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_dl.c	modified	+25	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_drm.c	modified	+1	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_drv.c	modified	+20	−2	View file
drivers/media/platform/renesas/vsp1/vsp1_pipe.c	modified	+3	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_regs.h	modified	+1	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_vspx.c	added	+633	−0	View file
drivers/media/platform/renesas/vsp1/vsp1_vspx.h	added	+16	−0	View file
drivers/media/platform/rockchip/Kconfig	modified	+1	−0	View file
drivers/media/platform/rockchip/Makefile	modified	+1	−0	View file
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h	modified	+2	−0	View file
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c	modified	+146	−4	View file
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h	modified	+25	−74	View file
drivers/staging/media/rkvdec/Kconfig → drivers/media/platform/rockchip/rkvdec/Kconfig	renamed	+0	−0	View file
drivers/staging/media/rkvdec/Makefile → drivers/media/platform/rockchip/rkvdec/Makefile	renamed	+0	−0	View file
drivers/staging/media/rkvdec/rkvdec-h264.c → drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c	renamed	+0	−0	View file
drivers/staging/media/rkvdec/rkvdec-regs.h → drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h	renamed	+0	−0	View file
drivers/staging/media/rkvdec/rkvdec-vp9.c → drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c	renamed	+0	−0	View file
drivers/staging/media/rkvdec/rkvdec.c → drivers/media/platform/rockchip/rkvdec/rkvdec.c	renamed	+36	−7	View file
drivers/staging/media/rkvdec/rkvdec.h → drivers/media/platform/rockchip/rkvdec/rkvdec.h	renamed	+1	−0	View file
drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c	modified	+1	−1	View file
drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h	modified	+0	−2	View file
drivers/media/platform/samsung/exynos4-is/fimc-is.c	modified	+1	−1	View file
drivers/media/platform/samsung/exynos4-is/media-dev.c	modified	+8	−19	View file
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c	modified	+12	−22	View file
drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c	modified	+2	−0	View file
drivers/media/platform/ti/vpe/vpdma.c	modified	+0	−32	View file
drivers/media/platform/ti/vpe/vpdma.h	modified	+0	−3	View file
drivers/media/platform/verisilicon/hantro.h	modified	+2	−0	View file
drivers/media/platform/verisilicon/hantro_g1_regs.h	modified	+1	−1	View file
drivers/media/platform/verisilicon/hantro_h264.c	modified	+3	−3	View file
drivers/media/platform/verisilicon/hantro_postproc.c	modified	+5	−1	View file
drivers/media/platform/verisilicon/rockchip_vpu_hw.c	modified	+0	−9	View file
drivers/media/platform/xilinx/xilinx-vipp.c	modified	+2	−5	View file
drivers/media/rc/ir-spi.c	modified	+26	−14	View file
drivers/media/test-drivers/vivid/vivid-ctrls.c	modified	+2	−1	View file
drivers/media/test-drivers/vivid/vivid-vbi-gen.c	modified	+2	−6	View file
drivers/media/test-drivers/vivid/vivid-vid-cap.c	modified	+2	−2	View file
drivers/media/usb/gspca/vicam.c	modified	+8	−2	View file
drivers/media/usb/hdpvr/hdpvr-i2c.c	modified	+8	−22	View file
drivers/media/usb/usbtv/usbtv-video.c	modified	+4	−0	View file
drivers/media/usb/uvc/uvc_ctrl.c	modified	+89	−42	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+35	−39	View file
drivers/media/usb/uvc/uvc_metadata.c	modified	+107	−15	View file
drivers/media/usb/uvc/uvc_queue.c	modified	+42	−157	View file
drivers/media/usb/uvc/uvc_v4l2.c	modified	+53	−313	View file
drivers/media/usb/uvc/uvc_video.c	modified	+15	−6	View file
drivers/media/usb/uvc/uvcvideo.h	modified	+13	−33	View file
drivers/media/v4l2-core/v4l2-common.c	modified	+36	−4	View file
drivers/media/v4l2-core/v4l2-ctrls-core.c	modified	+12	−8	View file
drivers/media/v4l2-core/v4l2-i2c.c	modified	+2	−1	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+8	−2	View file
drivers/media/v4l2-core/v4l2-jpeg.c	modified	+0	−80	View file
drivers/media/v4l2-core/v4l2-subdev.c	modified	+27	−4	View file
drivers/platform/x86/intel/int3472/tps68470_board_data.c	modified	+128	−0	View file
drivers/staging/media/Kconfig	modified	+2	−2	View file
drivers/staging/media/Makefile	modified	+1	−1	View file
drivers/staging/media/atomisp/Kconfig	modified	+1	−0	View file
drivers/staging/media/atomisp/Makefile	modified	+0	−1	View file
drivers/staging/media/atomisp/TODO	modified	+0	−2	View file
drivers/staging/media/atomisp/i2c/Kconfig	modified	+1	−0	View file
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c	modified	+341	−270	View file
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c	modified	+0	−2	View file
drivers/staging/media/atomisp/i2c/gc2235.h	modified	+8	−8	View file
drivers/staging/media/atomisp/i2c/ov2722.h	modified	+8	−8	View file
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c	modified	+1	−1	View file
drivers/staging/media/atomisp/pci/atomisp_csi2.h	modified	+0	−17	View file
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c	modified	+25	−208	View file
drivers/staging/media/atomisp/pci/atomisp_drvfs.c	deleted	+0	−155	View before deletion
drivers/staging/media/atomisp/pci/atomisp_drvfs.h	deleted	+0	−15	View before deletion
drivers/staging/media/atomisp/pci/atomisp_fops.c	modified	+1	−4	View file
drivers/staging/media/atomisp/pci/atomisp_ioctl.c	modified	+60	−69	View file
drivers/staging/media/atomisp/pci/atomisp_subdev.h	modified	+0	−3	View file
drivers/staging/media/atomisp/pci/atomisp_v4l2.c	modified	+1	−4	View file
drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h	modified	+0	−5	View file
drivers/staging/media/atomisp/pci/hmm/hmm.c	modified	+0	−91	View file
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c	modified	+2	−3	View file
drivers/staging/media/atomisp/pci/ia_css_pipe.h	modified	+0	−2	View file
drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h	modified	+3	−1	View file
drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h	modified	+4	−2	View file
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c	modified	+2	−2	View file
drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h	modified	+12	−10	View file
drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c	modified	+4	−2	View file
drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h	modified	+1	−1	View file
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c	modified	+1	−2	View file
drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h	modified	+4	−2	View file
drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h	deleted	+0	−157	View before deletion
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c	modified	+0	−1	View file
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c	modified	+15	−14	View file
drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c	modified	+5	−6	View file
drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c	modified	+1	−1	View file
drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h	modified	+0	−1	View file
drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c	modified	+0	−2	View file
drivers/staging/media/atomisp/pci/sh_css.c	modified	+0	−27	View file
drivers/staging/media/atomisp/pci/sh_css_defs.h	modified	+6	−6	View file
drivers/staging/media/atomisp/pci/sh_css_internal.h	modified	+3	−5	View file
drivers/staging/media/atomisp/pci/sh_css_mipi.c	modified	+0	−11	View file
drivers/staging/media/atomisp/pci/sh_css_mipi.h	modified	+0	−2	View file
drivers/staging/media/atomisp/pci/sh_css_param_dvs.h	modified	+11	−11	View file
drivers/staging/media/atomisp/pci/sh_css_params.c	modified	+6	−6	View file
drivers/staging/media/imx/imx-media-csc-scaler.c	modified	+1	−1	View file
drivers/staging/media/ipu7/Kconfig	added	+19	−0	View file
drivers/staging/media/ipu7/Makefile	added	+23	−0	View file
drivers/staging/media/ipu7/TODO	added	+28	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h	added	+163	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h	added	+175	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h	added	+19	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_insys_config_abi.h	added	+19	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h	added	+412	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h	added	+465	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h	added	+24	−0	View file
drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h	added	+49	−0	View file
drivers/staging/media/ipu7/ipu7-boot.c	added	+430	−0	View file
drivers/staging/media/ipu7/ipu7-boot.h	added	+25	−0	View file
drivers/staging/media/ipu7/ipu7-bus.c	added	+158	−0	View file
drivers/staging/media/ipu7/ipu7-bus.h	added	+69	−0	View file
drivers/staging/media/ipu7/ipu7-buttress-regs.h	added	+461	−0	View file
drivers/staging/media/ipu7/ipu7-buttress.c	added	+1192	−0	View file
drivers/staging/media/ipu7/ipu7-buttress.h	added	+77	−0	View file
drivers/staging/media/ipu7/ipu7-cpd.c	added	+276	−0	View file
drivers/staging/media/ipu7/ipu7-cpd.h	added	+16	−0	View file
drivers/staging/media/ipu7/ipu7-dma.c	added	+477	−0	View file
drivers/staging/media/ipu7/ipu7-dma.h	added	+46	−0	View file
drivers/staging/media/ipu7/ipu7-fw-isys.c	added	+301	−0	View file
drivers/staging/media/ipu7/ipu7-fw-isys.h	added	+39	−0	View file
drivers/staging/media/ipu7/ipu7-isys-csi-phy.c	added	+1034	−0	View file
drivers/staging/media/ipu7/ipu7-isys-csi-phy.h	added	+16	−0	View file
drivers/staging/media/ipu7/ipu7-isys-csi2-regs.h	added	+1197	−0	View file
drivers/staging/media/ipu7/ipu7-isys-csi2.c	added	+543	−0	View file
drivers/staging/media/ipu7/ipu7-isys-csi2.h	added	+64	−0	View file
drivers/staging/media/ipu7/ipu7-isys-queue.c	added	+829	−0	View file
drivers/staging/media/ipu7/ipu7-isys-queue.h	added	+72	−0	View file
drivers/staging/media/ipu7/ipu7-isys-subdev.c	added	+348	−0	View file
drivers/staging/media/ipu7/ipu7-isys-subdev.h	added	+53	−0	View file
drivers/staging/media/ipu7/ipu7-isys-video.c	added	+1112	−0	View file
drivers/staging/media/ipu7/ipu7-isys-video.h	added	+117	−0	View file
drivers/staging/media/ipu7/ipu7-isys.c	added	+1166	−0	View file
drivers/staging/media/ipu7/ipu7-isys.h	added	+140	−0	View file
drivers/staging/media/ipu7/ipu7-mmu.c	added	+853	−0	View file
drivers/staging/media/ipu7/ipu7-mmu.h	added	+414	−0	View file
drivers/staging/media/ipu7/ipu7-platform-regs.h	added	+82	−0	View file
drivers/staging/media/ipu7/ipu7-syscom.c	added	+78	−0	View file
drivers/staging/media/ipu7/ipu7-syscom.h	added	+35	−0	View file
drivers/staging/media/ipu7/ipu7.c	added	+2783	−0	View file
drivers/staging/media/ipu7/ipu7.h	added	+242	−0	View file
drivers/staging/media/rkvdec/TODO	deleted	+0	−11	View before deletion
drivers/staging/media/sunxi/cedrus/cedrus_hw.c	modified	+18	−1	View file
drivers/staging/media/sunxi/cedrus/cedrus_video.c	modified	+18	−0	View file
include/linux/usb/uvc.h	modified	+3	−0	View file
include/media/rcar-fcp.h	modified	+5	−0	View file
include/media/v4l2-ctrls.h	modified	+3	−1	View file
include/media/v4l2-dev.h	modified	+10	−4	View file
include/media/v4l2-ioctl.h	modified	+1	−0	View file
include/media/v4l2-jpeg.h	modified	+0	−9	View file
include/media/v4l2-subdev.h	modified	+0	−3	View file
include/media/vsp1.h	modified	+89	−0	View file
include/uapi/linux/media/raspberrypi/pisp_be_config.h	modified	+5	−4	View file
include/uapi/linux/rkisp1-config.h	modified	+105	−1	View file
include/uapi/linux/v4l2-controls.h	modified	+6	−0	View file
include/uapi/linux/videodev2.h	modified	+8	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index b1f0edf..729eb5d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -287,8 +287,9 @@ Gustavo Padovan <[email protected]>
 Hamza Mahfooz <[email protected]> <[email protected]>
 Hanjun Guo <[email protected]> <[email protected]>
 Hans de Goede <[email protected]> <[email protected]>
-Hans Verkuil <[email protected]> <[email protected]>
-Hans Verkuil <[email protected]> <[email protected]>
+Hans Verkuil <[email protected]> <[email protected]>
+Hans Verkuil <[email protected]> <[email protected]>
+Hans Verkuil <[email protected]> <[email protected]>
 Harry Yoo <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>

Documentation/devicetree/bindings/media/cdns,csi2rx.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/cdns,csi2rx.yaml b/Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
index 2008a47..6ed9a56 100644
--- a/Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
+++ b/Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
@@ -24,6 +24,14 @@ properties:
   reg:
     maxItems: 1
 
+  interrupts:
+    maxItems: 2
+
+  interrupt-names:
+    items:
+      - const: error_irq
+      - const: irq
+
   clocks:
     items:
       - description: CSI2Rx system clock

Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml b/Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml
new file mode 100644
index 0000000..511ac0d
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml
@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/fsl,imx6q-vdoa.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Freescale Video Data Order Adapter
+
+description:
+  The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose
+  is to reorder video data from the macroblock tiled order produced by the CODA
+  960 VPU to the conventional raster-scan order for scanout.
+
+maintainers:
+  - Frank Li <[email protected]>
+
+properties:
+  compatible:
+    const: "fsl,imx6q-vdoa"
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/clock/imx6qdl-clock.h>
+
+    vdoa@21e4000 {
+        compatible = "fsl,imx6q-vdoa";
+        reg = <0x021e4000 0x4000>;
+        interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&clks IMX6QDL_CLK_VDOA>;
+    };

Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml b/Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml
new file mode 100644
index 0000000..93f527e
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml
@@ -0,0 +1,117 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/fsl,imx8qm-isi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: i.MX8QM Image Sensing Interface
+
+maintainers:
+  - Frank Li <[email protected]>
+
+description:
+  The Image Sensing Interface (ISI) combines image processing pipelines with
+  DMA engines to process and capture frames originating from a variety of
+  sources. The inputs to the ISI go through Pixel Link interfaces, and their
+  number and nature is SoC-dependent. They cover both capture interfaces (MIPI
+  CSI-2 RX, HDMI RX, ...) and display engine outputs for writeback support.
+
+properties:
+  compatible:
+    enum:
+      - fsl,imx8qm-isi
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 8
+
+  clock-names:
+    items:
+      - const: per0
+      - const: per1
+      - const: per2
+      - const: per3
+      - const: per4
+      - const: per5
+      - const: per6
+      - const: per7
+
+  interrupts:
+    maxItems: 8
+
+  power-domains:
+    maxItems: 8
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+    properties:
+      port@2:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: MIPI CSI-2 RX 0
+      port@3:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: MIPI CSI-2 RX 1
+      port@4:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: HDMI RX
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - interrupts
+  - power-domains
+  - ports
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/clock/imx8-clock.h>
+    #include <dt-bindings/clock/imx8-lpcg.h>
+    #include <dt-bindings/firmware/imx/rsrc.h>
+
+    image-controller@58100000 {
+        compatible = "fsl,imx8qm-isi";
+        reg = <0x58100000 0x80000>;
+        interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 301 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 303 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&pdma0_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma1_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma2_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma3_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma4_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma5_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma6_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma7_lpcg IMX_LPCG_CLK_0>;
+        clock-names = "per0", "per1", "per2", "per3",
+                      "per4", "per5", "per6", "per7";
+        power-domains = <&pd IMX_SC_R_ISI_CH0>, <&pd IMX_SC_R_ISI_CH1>,
+                        <&pd IMX_SC_R_ISI_CH2>, <&pd IMX_SC_R_ISI_CH3>,
+                        <&pd IMX_SC_R_ISI_CH4>, <&pd IMX_SC_R_ISI_CH5>,
+                        <&pd IMX_SC_R_ISI_CH6>, <&pd IMX_SC_R_ISI_CH7>;
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@2 {
+                reg = <2>;
+                endpoint {
+                    remote-endpoint = <&mipi_csi0_out>;
+                };
+            };
+        };
+    };
+...

Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml b/Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml
new file mode 100644
index 0000000..bb41996
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml
@@ -0,0 +1,106 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/fsl,imx8qxp-isi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: i.MX8QXP Image Sensing Interface
+
+maintainers:
+  - Frank Li <[email protected]>
+
+description:
+  The Image Sensing Interface (ISI) combines image processing pipelines with
+  DMA engines to process and capture frames originating from a variety of
+  sources. The inputs to the ISI go through Pixel Link interfaces, and their
+  number and nature is SoC-dependent. They cover both capture interfaces (MIPI
+  CSI-2 RX, HDMI RX, ...) and display engine outputs for writeback support.
+
+properties:
+  compatible:
+    enum:
+      - fsl,imx8qxp-isi
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 6
+
+  clock-names:
+    items:
+      - const: per0
+      - const: per1
+      - const: per2
+      - const: per3
+      - const: per4
+      - const: per5
+
+  interrupts:
+    maxItems: 6
+
+  power-domains:
+    maxItems: 6
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+    properties:
+      port@2:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: MIPI CSI-2 RX 0
+      port@6:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: CSI-2 Parallel RX
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - interrupts
+  - power-domains
+  - ports
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/clock/imx8-clock.h>
+    #include <dt-bindings/clock/imx8-lpcg.h>
+    #include <dt-bindings/firmware/imx/rsrc.h>
+
+    image-controller@58100000 {
+        compatible = "fsl,imx8qxp-isi";
+        reg = <0x58100000 0x60000>;
+        interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 301 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&pdma0_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma1_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma2_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma3_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma4_lpcg IMX_LPCG_CLK_0>,
+                 <&pdma5_lpcg IMX_LPCG_CLK_0>;
+        clock-names = "per0", "per1", "per2", "per3", "per4", "per5";
+        power-domains = <&pd IMX_SC_R_ISI_CH0>, <&pd IMX_SC_R_ISI_CH1>,
+                        <&pd IMX_SC_R_ISI_CH2>, <&pd IMX_SC_R_ISI_CH3>,
+                        <&pd IMX_SC_R_ISI_CH4>, <&pd IMX_SC_R_ISI_CH5>;
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@2 {
+                reg = <2>;
+                endpoint {
+                    remote-endpoint = <&mipi_csi0_out>;
+                };
+            };
+        };
+    };
+...

Documentation/devicetree/bindings/media/fsl-vdoa.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/fsl-vdoa.txt b/Documentation/devicetree/bindings/media/fsl-vdoa.txt
deleted file mode 100644
index 6c56285..0000000
--- a/Documentation/devicetree/bindings/media/fsl-vdoa.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Freescale Video Data Order Adapter
-==================================
-
-The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose
-is to reorder video data from the macroblock tiled order produced by the CODA
-960 VPU to the conventional raster-scan order for scanout.
-
-Required properties:
-- compatible: must be "fsl,imx6q-vdoa"
-- reg: the register base and size for the device registers
-- interrupts: the VDOA interrupt
-- clocks: the vdoa clock
-
-Example:
-
-vdoa@21e4000 {
-        compatible = "fsl,imx6q-vdoa";
-        reg = <0x021e4000 0x4000>;
-        interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
-        clocks = <&clks IMX6QDL_CLK_VDOA>;
-};

Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
index f8ace8c..bc664a0 100644
--- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
@@ -23,6 +23,9 @@ description:
   More detailed documentation can be found in
   Documentation/devicetree/bindings/media/video-interfaces.txt .
 
+allOf:
+  - $ref: /schemas/media/video-interface-devices.yaml#
+
 properties:
   compatible:
     oneOf:
@@ -58,16 +61,10 @@ properties:
       documentation.
     maxItems: 1
 
-  flash-leds:
-    description: Flash LED phandles. See ../video-interfaces.txt for details.
-
-  lens-focus:
-    description: Lens focus controller phandles. See ../video-interfaces.txt
-      for details.
+  flash-leds: true
+  lens-focus: true
 
   rotation:
-    description: Rotation of the sensor.  See ../video-interfaces.txt for
-      details.
     enum: [ 0, 180 ]
 
   port:

Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml b/Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
index f6b8789..a89f740 100644
--- a/Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
@@ -70,6 +70,15 @@ properties:
           - bus-type
           - link-frequencies
 
+  slew-rate:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Slew rate ot the output pads DOUT[7:0], LINE_VALID, FRAME_VALID and
+      PIXCLK. Higher values imply steeper voltage-flanks on the pads.
+    minimum: 0
+    maximum: 7
+    default: 7
+
 required:
   - compatible
   - reg

Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
index a65f921..491f293 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
@@ -15,6 +15,8 @@ description: |
   controlled through an I2C-compatible SCCB bus. The sensor transmits images
   on a MIPI CSI-2 output interface with up to 4 data lanes.
 
+$ref: /schemas/media/video-interface-devices.yaml#
+
 properties:
   compatible:
     const: ovti,ov8858
@@ -69,7 +71,7 @@ required:
   - clocks
   - port
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |

Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
index 0162eec..aea99eb 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
@@ -33,20 +33,21 @@ properties:
 
   clock-frequency:
     description: Frequency of the xclk clock in Hz.
+    deprecated: true
 
   enable-gpios:
     description: GPIO descriptor for the enable pin.
     maxItems: 1
 
-  vdddo-supply:
-    description: Chip digital IO regulator (1.8V).
-
   vdda-supply:
     description: Chip analog regulator (2.7V).
 
   vddd-supply:
     description: Chip digital core regulator (1.12V).
 
+  vdddo-supply:
+    description: Chip digital IO regulator (1.8V).
+
   flash-leds: true
   lens-focus: true
 
@@ -84,11 +85,10 @@ required:
   - compatible
   - reg
   - clocks
-  - clock-frequency
   - enable-gpios
-  - vdddo-supply
   - vdda-supply
   - vddd-supply
+  - vdddo-supply
   - port
 
 unevaluatedProperties: false
@@ -104,22 +104,25 @@ examples:
         camera-sensor@1a {
             compatible = "sony,imx214";
             reg = <0x1a>;
-            vdddo-supply = <&pm8994_lvs1>;
-            vddd-supply = <&camera_vddd_1v12>;
+
+            clocks = <&camera_clk>;
+            assigned-clocks = <&camera_clk>;
+            assigned-clock-rates = <24000000>;
+
+            enable-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;
+
             vdda-supply = <&pm8994_l17>;
+            vddd-supply = <&camera_vddd_1v12>;
+            vdddo-supply = <&pm8994_lvs1>;
+
             lens-focus = <&ad5820>;
-            enable-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;
-            clocks = <&camera_clk>;
-            clock-frequency = <24000000>;
 
             port {
                 imx214_ep: endpoint {
                     data-lanes = <1 2 3 4>;
-                    link-frequencies = /bits/ 64 <480000000>;
+                    link-frequencies = /bits/ 64 <600000000>;
                     remote-endpoint = <&csiphy0_ep>;
                 };
             };
         };
     };
-
-...

Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml
index 975c1d7..421b935 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml
@@ -18,6 +18,8 @@ description: |-
   The camera module does not expose the model through registers, so the
   exact model needs to be specified.
 
+$ref: /schemas/media/video-interface-devices.yaml#
+
 properties:
   compatible:
     enum:
@@ -81,7 +83,7 @@ required:
   - reg
   - port
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |

Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
index 2be30c5..4cba42b 100644
--- a/Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
+++ b/Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@ -22,10 +22,14 @@ properties:
             - nxp,imx8qxp-jpgdec
             - nxp,imx8qxp-jpgenc
       - items:
-          - const: nxp,imx8qm-jpgdec
+          - enum:
+              - nxp,imx8qm-jpgdec
+              - nxp,imx95-jpgdec
           - const: nxp,imx8qxp-jpgdec
       - items:
-          - const: nxp,imx8qm-jpgenc
+          - enum:
+              - nxp,imx8qm-jpgenc
+              - nxp,imx95-jpgenc
           - const: nxp,imx8qxp-jpgenc
 
   reg:
@@ -48,7 +52,7 @@ properties:
     description:
       List of phandle and PM domain specifier as documented in
       Documentation/devicetree/bindings/power/power_domain.txt
-    minItems: 2               # Wrapper and 1 slot
+    minItems: 1               # Wrapper and all slots
     maxItems: 5               # Wrapper and 4 slots
 
 required:
@@ -58,6 +62,24 @@ required:
   - interrupts
   - power-domains
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - nxp,imx95-jpgenc
+              - nxp,imx95-jpgdec
+    then:
+      properties:
+        power-domains:
+          maxItems: 1
+    else:
+      properties:
+        power-domains:
+          minItems: 2        # Wrapper and 1 slot
+
+
 additionalProperties: false
 
 examples:

Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
index 2a14e3b..3389bab 100644
--- a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
+++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
@@ -16,11 +16,19 @@ description: |-
 
 properties:
   compatible:
-    enum:
-      - fsl,imx8mq-mipi-csi2
+    oneOf:
+      - enum:
+          - fsl,imx8mq-mipi-csi2
+          - fsl,imx8qxp-mipi-csi2
+      - items:
+          - const: fsl,imx8qm-mipi-csi2
+          - const: fsl,imx8qxp-mipi-csi2
 
   reg:
-    maxItems: 1
+    items:
+      - description: MIPI CSI-2 RX host controller register.
+      - description: MIPI CSI-2 control and status register (csr).
+    minItems: 1
 
   clocks:
     items: