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

063d1942 · Linus Torvalds <[email protected]> · 2020-03-30 13:42:05 -07:00

Pull media updates from Mauro Carvalho Chehab:

 - New sensor driver: imx219

 - Support for some new pixelformats

 - Support for Sun8i SoC

 - Added more codecs to meson vdec driver

 - Prepare for removing the legacy usbvision driver by moving it to
   staging. This driver has issues and use legacy core APIs. If nobody
   steps up to address those, it is time for its retirement.

 - Several cleanups and improvements on drivers, with the addition of
   new supported boards

* tag 'media/v5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (236 commits)
  media: venus: firmware: Ignore secure call error on first resume
  media: mtk-vpu: load vpu firmware from the new location
  media: i2c: video-i2c: fix build errors due to 'imply hwmon'
  media: MAINTAINERS: add myself to co-maintain Hantro G1/G2 for i.MX8MQ
  media: hantro: add initial i.MX8MQ support
  media: dt-bindings: Document i.MX8MQ VPU bindings
  media: vivid: fix incorrect PA assignment to HDMI outputs
  media: hantro: Add linux-rockchip mailing list to MAINTAINERS
  media: cedrus: h264: Fix 4K decoding on H6
  media: siano: Use scnprintf() for avoiding potential buffer overflow
  media: rc: Use scnprintf() for avoiding potential buffer overflow
  media: allegro: create new struct for channel parameters
  media: allegro: move mail definitions to separate file
  media: allegro: pass buffers through firmware
  media: allegro: verify source and destination buffer in VCU response
  media: allegro: handle dependency of bitrate and bitrate_peak
  media: allegro: read bitrate mode directly from control
  media: allegro: make QP configurable
  media: allegro: make frame rate configurable
  media: allegro: skip filler data if possible
  ...

Commit: 063d1942247668eb0bb800aef5afbbef337344be
Parents: 47acac8c · 2632e7b6

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

Changes

343 files changed · +14879 −3012

File	Status	Add	Del	Content
.mailmap	modified	+1	−0	View file
Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt	modified	+6	−0	View file
Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml	added	+70	−0	View file
Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml	modified	+5	−1	View file
Documentation/devicetree/bindings/media/aspeed-video.txt	modified	+3	−2	View file
Documentation/devicetree/bindings/media/i2c/imx219.yaml	added	+114	−0	View file
Documentation/devicetree/bindings/media/i2c/tvp5150.txt	modified	+129	−17	View file
Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml	added	+77	−0	View file
Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml	added	+119	−0	View file
Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml	added	+172	−0	View file
Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml	added	+140	−0	View file
Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml	added	+140	−0	View file
Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml	added	+156	−0	View file
Documentation/devicetree/bindings/media/qcom,venus.txt	deleted	+0	−120	View before deletion
Documentation/devicetree/bindings/media/rc.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/media/rockchip-rga.txt	modified	+3	−2	View file
Documentation/media/kapi/csi2.rst	modified	+1	−1	View file
Documentation/media/kapi/v4l2-dev.rst	modified	+2	−2	View file
Documentation/media/uapi/cec/cec-ioc-adap-g-conn-info.rst	modified	+5	−5	View file
Documentation/media/uapi/cec/cec-ioc-dqevent.rst	modified	+9	−11	View file
Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst	modified	+7	−17	View file
Documentation/media/uapi/v4l/buffer.rst	modified	+16	−37	View file
Documentation/media/uapi/v4l/dev-sliced-vbi.rst	modified	+6	−9	View file
Documentation/media/uapi/v4l/ext-ctrls-codec.rst	modified	+16	−0	View file
Documentation/media/uapi/v4l/pixfmt-bayer.rst	modified	+1	−0	View file
Documentation/media/uapi/v4l/pixfmt-srggb14.rst	added	+82	−0	View file
Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst	modified	+4	−2	View file
Documentation/media/uapi/v4l/pixfmt-v4l2.rst	modified	+0	−2	View file
Documentation/media/uapi/v4l/pixfmt-y14.rst	added	+72	−0	View file
Documentation/media/uapi/v4l/subdev-formats.rst	modified	+37	−0	View file
Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst	modified	+6	−6	View file
Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst	modified	+6	−6	View file
Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst	modified	+7	−19	View file
Documentation/media/uapi/v4l/vidioc-dqevent.rst	modified	+17	−38	View file
Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst	modified	+6	−8	View file
Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst	modified	+7	−12	View file
Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst	modified	+7	−11	View file
Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst	modified	+7	−9	View file
Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst	modified	+18	−27	View file
Documentation/media/uapi/v4l/vidioc-g-fmt.rst	modified	+11	−18	View file
Documentation/media/uapi/v4l/vidioc-g-parm.rst	modified	+7	−11	View file
Documentation/media/uapi/v4l/vidioc-queryctrl.rst	modified	+8	−13	View file
Documentation/media/uapi/v4l/yuv-formats.rst	modified	+1	−0	View file
Documentation/media/v4l-drivers/ipu3.rst	modified	+7	−4	View file
Documentation/media/v4l-drivers/vivid.rst	modified	+60	−3	View file
Documentation/translations/zh_CN/video4linux/v4l2-framework.txt	modified	+2	−2	View file
MAINTAINERS	modified	+26	−6	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts	modified	+4	−0	View file
drivers/base/property.c	modified	+1	−0	View file
drivers/media/Kconfig	modified	+3	−3	View file
drivers/media/cec/cec-notifier.c	modified	+27	−14	View file
drivers/media/common/saa7146/saa7146_fops.c	modified	+5	−7	View file
drivers/media/common/siano/smsdvb-debugfs.c	modified	+110	−104	View file
drivers/media/common/videobuf2/videobuf2-core.c	modified	+2	−2	View file
drivers/media/common/videobuf2/videobuf2-dma-contig.c	modified	+2	−2	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+2	−2	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+455	−11	View file
drivers/media/dvb-frontends/m88ds3103_priv.h	modified	+12	−2	View file
drivers/media/dvb-frontends/tda10071.c	modified	+5	−4	View file
drivers/media/i2c/Kconfig	modified	+16	−0	View file
drivers/media/i2c/Makefile	modified	+1	−0	View file
drivers/media/i2c/adv7180.c	modified	+12	−0	View file
drivers/media/i2c/imx214.c	modified	+0	−1	View file
drivers/media/i2c/imx219.c	added	+1481	−0	View file
drivers/media/i2c/ov5675.c	modified	+73	−9	View file
drivers/media/i2c/ov5695.c	modified	+31	−18	View file
drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c	modified	+1	−1	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+129	−130	View file
drivers/media/i2c/smiapp/smiapp-reg.h	modified	+4	−0	View file
drivers/media/i2c/smiapp/smiapp-regs.c	modified	+20	−51	View file
drivers/media/i2c/smiapp/smiapp.h	modified	+43	−1	View file
drivers/media/i2c/tvp5150.c	modified	+622	−180	View file
drivers/media/i2c/video-i2c.c	modified	+2	−2	View file
drivers/media/mc/mc-entity.c	modified	+8	−3	View file
drivers/media/pci/bt8xx/bttv-driver.c	modified	+2	−2	View file
drivers/media/pci/cobalt/cobalt-v4l2.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-streams.c	modified	+6	−6	View file
drivers/media/pci/cx23885/cx23885-417.c	modified	+1	−1	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+1	−1	View file
drivers/media/pci/cx25821/cx25821-video.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-blackbird.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-video.c	modified	+1	−1	View file
drivers/media/pci/dt3155/dt3155.c	modified	+1	−1	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.c	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-streams.c	modified	+6	−6	View file
drivers/media/pci/meye/meye.c	modified	+1	−1	View file
drivers/media/pci/saa7134/saa7134-core.c	modified	+1	−1	View file
drivers/media/pci/saa7134/saa7134-empress.c	modified	+1	−1	View file
drivers/media/pci/saa7146/hexium_gemini.c	modified	+1	−1	View file
drivers/media/pci/saa7146/hexium_orion.c	modified	+1	−1	View file
drivers/media/pci/saa7146/mxb.c	modified	+1	−1	View file
drivers/media/pci/saa7164/saa7164-encoder.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-v4l2.c	modified	+1	−1	View file
drivers/media/pci/sta2x11/sta2x11_vip.c	modified	+1	−1	View file
drivers/media/pci/ttpci/av7110_v4l.c	modified	+1	−1	View file
drivers/media/pci/ttpci/budget-av.c	modified	+1	−1	View file
drivers/media/pci/tw5864/tw5864-video.c	modified	+1	−1	View file
drivers/media/pci/tw68/tw68-video.c	modified	+1	−1	View file
drivers/media/pci/tw686x/tw686x-video.c	modified	+1	−1	View file
drivers/media/platform/Kconfig	modified	+49	−37	View file
drivers/media/platform/am437x/am437x-vpfe.c	modified	+7	−6	View file
drivers/media/platform/aspeed-video.c	modified	+58	−28	View file
drivers/media/platform/atmel/atmel-isc-base.c	modified	+196	−28	View file
drivers/media/platform/atmel/atmel-isc.h	modified	+22	−1	View file
drivers/media/platform/atmel/atmel-isi.c	modified	+1	−1	View file
drivers/media/platform/coda/coda-common.c	modified	+1	−1	View file
drivers/media/platform/davinci/isif.c	modified	+1	−1	View file
drivers/media/platform/davinci/vpbe_display.c	modified	+1	−1	View file
drivers/media/platform/davinci/vpfe_capture.c	modified	+2	−2	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+1	−1	View file
drivers/media/platform/davinci/vpif_display.c	modified	+1	−1	View file
drivers/media/platform/exynos-gsc/gsc-m2m.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/Kconfig	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-capture.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-isp-video.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-lite.c	modified	+4	−1	View file
drivers/media/platform/exynos4-is/fimc-m2m.c	modified	+1	−1	View file
drivers/media/platform/fsl-viu.c	modified	+1	−1	View file
drivers/media/platform/imx-pxp.c	modified	+1	−1	View file
drivers/media/platform/m2m-deinterlace.c	modified	+1	−1	View file
drivers/media/platform/marvell-ccic/mcam-core.c	modified	+1	−1	View file
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c	modified	+1	−1	View file
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c	modified	+6	−0	View file
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c	modified	+1	−1	View file
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c	modified	+5	−4	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c	modified	+1	−1	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c	modified	+1	−1	View file
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c	modified	+25	−4	View file
drivers/media/platform/mtk-vcodec/vdec_vpu_if.c	modified	+3	−3	View file
drivers/media/platform/mtk-vcodec/venc_vpu_if.c	modified	+6	−6	View file
drivers/media/platform/mtk-vpu/mtk_vpu.c	modified	+36	−25	View file
drivers/media/platform/mtk-vpu/mtk_vpu.h	modified	+1	−1	View file
drivers/media/platform/mx2_emmaprp.c	modified	+1	−1	View file
drivers/media/platform/omap/omap_vout.c	modified	+1	−1	View file
drivers/media/platform/omap3isp/ispccdc.c	modified	+4	−0	View file
drivers/media/platform/omap3isp/ispvideo.c	modified	+4	−4	View file
drivers/media/platform/pxa_camera.c	modified	+11	−11	View file
drivers/media/platform/qcom/camss/camss-video.c	modified	+3	−3	View file
drivers/media/platform/qcom/venus/Makefile	modified	+1	−1	View file
drivers/media/platform/qcom/venus/core.c	modified	+104	−63	View file
drivers/media/platform/qcom/venus/core.h	modified	+24	−9	View file
drivers/media/platform/qcom/venus/firmware.c	modified	+9	−4	View file
drivers/media/platform/qcom/venus/helpers.c	modified	+116	−332	View file
drivers/media/platform/qcom/venus/helpers.h	modified	+0	−4	View file
drivers/media/platform/qcom/venus/hfi_cmds.c	modified	+2	−0	View file
drivers/media/platform/qcom/venus/hfi_helper.h	modified	+6	−0	View file
drivers/media/platform/qcom/venus/hfi_parser.c	modified	+1	−0	View file
drivers/media/platform/qcom/venus/hfi_parser.h	modified	+5	−0	View file
drivers/media/platform/qcom/venus/pm_helpers.c	added	+959	−0	View file
drivers/media/platform/qcom/venus/pm_helpers.h	added	+65	−0	View file
drivers/media/platform/qcom/venus/vdec.c	modified	+32	−54	View file
drivers/media/platform/qcom/venus/venc.c	modified	+28	−53	View file
drivers/media/platform/qcom/venus/venc_ctrls.c	modified	+7	−1	View file
drivers/media/platform/rcar-vin/rcar-dma.c	modified	+71	−20	View file
drivers/media/platform/rcar-vin/rcar-v4l2.c	modified	+25	−9	View file
drivers/media/platform/rcar-vin/rcar-vin.h	modified	+24	−4	View file
drivers/media/platform/rcar_drif.c	modified	+8	−4	View file
drivers/media/platform/rcar_fdp1.c	modified	+1	−1	View file
drivers/media/platform/rcar_jpu.c	modified	+2	−2	View file
drivers/media/platform/renesas-ceu.c	modified	+1	−1	View file
drivers/media/platform/rockchip/rga/rga.c	modified	+1	−1	View file
drivers/media/platform/s3c-camif/camif-capture.c	modified	+1	−1	View file
drivers/media/platform/s5p-g2d/g2d.c	modified	+1	−1	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+2	−2	View file
drivers/media/platform/s5p-mfc/s5p_mfc.c	modified	+2	−2	View file
drivers/media/platform/sh_veu.c	modified	+1	−1	View file
drivers/media/platform/sh_vou.c	modified	+1	−1	View file
drivers/media/platform/sti/bdisp/bdisp-v4l2.c	modified	+1	−1	View file
drivers/media/platform/sti/delta/delta-v4l2.c	modified	+1	−1	View file
drivers/media/platform/sti/hva/hva-v4l2.c	modified	+1	−1	View file
drivers/media/platform/stm32/stm32-cec.c	modified	+8	−2	View file
drivers/media/platform/stm32/stm32-dcmi.c	modified	+8	−5	View file
drivers/media/platform/sunxi/Makefile	modified	+1	−0	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c	modified	+4	−4	View file
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c	modified	+4	−4	View file
drivers/media/platform/sunxi/sun8i-di/sun8i-di.c	modified	+2	−5	View file
drivers/media/platform/sunxi/sun8i-rotate/Makefile	added	+5	−0	View file
drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h	added	+25	−0	View file
drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h	added	+135	−0	View file
drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c	added	+273	−0	View file
drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c	added	+924	−0	View file
drivers/media/platform/ti-vpe/cal.c	modified	+17	−14	View file
drivers/media/platform/ti-vpe/vpe.c	modified	+1	−1	View file
drivers/media/platform/via-camera.c	modified	+1	−1	View file
drivers/media/platform/vicodec/vicodec-core.c	modified	+53	−111	View file
drivers/media/platform/vim2m.c	modified	+1	−1	View file
drivers/media/platform/vimc/vimc-capture.c	modified	+10	−10	View file
drivers/media/platform/vimc/vimc-common.c	modified	+0	−2	View file
drivers/media/platform/vimc/vimc-common.h	modified	+13	−14	View file
drivers/media/platform/vimc/vimc-core.c	modified	+61	−32	View file
drivers/media/platform/vimc/vimc-debayer.c	modified	+4	−17	View file
drivers/media/platform/vimc/vimc-scaler.c	modified	+4	−17	View file
drivers/media/platform/vimc/vimc-sensor.c	modified	+4	−16	View file
drivers/media/platform/vimc/vimc-streamer.c	modified	+14	−3	View file
drivers/media/platform/vivid/vivid-core.c	modified	+7	−7	View file
drivers/media/platform/vsp1/vsp1_histo.c	modified	+2	−2	View file
drivers/media/platform/vsp1/vsp1_regs.h	modified	+1	−1	View file
drivers/media/platform/vsp1/vsp1_video.c	modified	+2	−2	View file
drivers/media/platform/xilinx/xilinx-dma.c	modified	+8	−7	View file
drivers/media/radio/si470x/Kconfig	modified	+2	−2	View file
drivers/media/rc/bpf-lirc.c	modified	+0	−5	View file
drivers/media/rc/iguanair.c	modified	+1	−1	View file
drivers/media/rc/ir-xmp-decoder.c	modified	+1	−1	View file
drivers/media/rc/keymaps/Makefile	modified	+1	−0	View file
drivers/media/rc/keymaps/rc-videostrong-kii-pro.c	added	+83	−0	View file
drivers/media/rc/lirc_dev.c	modified	+1	−6	View file
drivers/media/rc/nuvoton-cir.c	modified	+2	−2	View file
drivers/media/rc/rc-main.c	modified	+58	−22	View file
drivers/media/spi/gs1662.c	modified	+16	−4	View file
drivers/media/usb/Kconfig	modified	+0	−1	View file
drivers/media/usb/Makefile	modified	+0	−1	View file
drivers/media/usb/au0828/au0828-video.c	modified	+2	−2	View file
drivers/media/usb/b2c2/flexcop-usb.c	modified	+3	−3	View file
drivers/media/usb/cpia2/cpia2_v4l.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-417.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-dvb.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-video.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/anysee.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb-v2/lmedm04.c	modified	+1	−4	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+3	−0	View file
drivers/media/usb/dvb-usb/cxusb-analog.c	modified	+6	−6	View file
drivers/media/usb/dvb-usb/dib0700_core.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+43	−2	View file
drivers/media/usb/em28xx/em28xx-cards.c	modified	+18	−0	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+60	−0	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+2	−2	View file
drivers/media/usb/em28xx/em28xx.h	modified	+1	−0	View file
drivers/media/usb/go7007/go7007-usb.c	modified	+3	−1	View file
drivers/media/usb/go7007/go7007-v4l2.c	modified	+1	−1	View file
drivers/media/usb/gspca/gspca.c	modified	+1	−1	View file
drivers/media/usb/gspca/ov519.c	modified	+10	−0	View file
drivers/media/usb/gspca/stv06xx/stv06xx.c	modified	+18	−1	View file
drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c	modified	+4	−0	View file
drivers/media/usb/gspca/xirlink_cit.c	modified	+17	−1	View file
drivers/media/usb/hdpvr/hdpvr-video.c	modified	+1	−1	View file
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c	modified	+2	−2	View file
drivers/media/usb/pwc/pwc-if.c	modified	+1	−1	View file
drivers/media/usb/s2255/s2255drv.c	modified	+2	−2	View file
drivers/media/usb/stk1160/stk1160-v4l.c	modified	+1	−1	View file
drivers/media/usb/stkwebcam/stk-webcam.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-video.c	modified	+2	−2	View file
drivers/media/usb/usbtv/usbtv-core.c	modified	+1	−1	View file
drivers/media/usb/usbtv/usbtv-video.c	modified	+4	−3	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+1	−1	View file
drivers/media/usb/zr364xx/zr364xx.c	modified	+1	−1	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+9	−2	View file
drivers/media/v4l2-core/v4l2-dev.c	modified	+5	−5	View file
drivers/media/v4l2-core/v4l2-device.c	modified	+3	−5	View file
drivers/media/v4l2-core/v4l2-fwnode.c	modified	+176	−16	View file
drivers/media/v4l2-core/v4l2-i2c.c	modified	+5	−5	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+7	−2	View file
drivers/media/v4l2-core/v4l2-mc.c	modified	+15	−3	View file
drivers/media/v4l2-core/v4l2-mem2mem.c	modified	+219	−2	View file
drivers/staging/media/Kconfig	modified	+4	−0	View file
drivers/staging/media/Makefile	modified	+1	−0	View file
drivers/staging/media/allegro-dvt/Makefile	modified	+1	−1	View file
drivers/staging/media/allegro-dvt/allegro-core.c	modified	+540	−390	View file
drivers/staging/media/allegro-dvt/allegro-mail.c	added	+37	−0	View file
drivers/staging/media/allegro-dvt/allegro-mail.h	added	+267	−0	View file
drivers/staging/media/hantro/Kconfig	modified	+12	−4	View file
drivers/staging/media/hantro/Makefile	modified	+3	−0	View file
drivers/staging/media/hantro/hantro.h	modified	+1	−1	View file
drivers/staging/media/hantro/hantro_drv.c	modified	+14	−1	View file
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c	modified	+15	−4	View file
drivers/staging/media/hantro/hantro_hw.h	modified	+1	−0	View file
drivers/staging/media/hantro/hantro_jpeg.c	modified	+56	−20	View file
drivers/staging/media/hantro/hantro_jpeg.h	modified	+1	−1	View file
drivers/staging/media/hantro/hantro_v4l2.c	modified	+1	−1	View file
drivers/staging/media/hantro/imx8m_vpu_hw.c	added	+220	−0	View file
drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c	modified	+17	−7	View file
drivers/staging/media/imx/imx-media-capture.c	modified	+4	−4	View file
drivers/staging/media/imx/imx-media-csc-scaler.c	modified	+1	−1	View file
drivers/staging/media/imx/imx-media-csi.c	modified	+4	−1	View file
drivers/staging/media/imx/imx-media-utils.c	modified	+13	−6	View file
drivers/staging/media/imx/imx7-media-csi.c	modified	+23	−1	View file
drivers/staging/media/imx/imx7-mipi-csis.c	modified	+15	−1	View file
drivers/staging/media/ipu3/TODO	modified	+0	−2	View file
drivers/staging/media/ipu3/ipu3-css.c	modified	+3	−3	View file
drivers/staging/media/ipu3/ipu3-css.h	modified	+2	−1	View file
drivers/staging/media/ipu3/ipu3-mmu.c	modified	+2	−2	View file
drivers/staging/media/ipu3/ipu3-v4l2.c	modified	+1	−1	View file
drivers/staging/media/ipu3/ipu3.c	modified	+14	−2	View file
drivers/staging/media/meson/vdec/Makefile	modified	+2	−2	View file
drivers/staging/media/meson/vdec/codec_h264.c	added	+485	−0	View file
drivers/staging/media/meson/vdec/codec_h264.h	added	+14	−0	View file
drivers/staging/media/meson/vdec/codec_hevc_common.c	added	+297	−0	View file
drivers/staging/media/meson/vdec/codec_hevc_common.h	added	+71	−0	View file
drivers/staging/media/meson/vdec/codec_vp9.c	added	+2141	−0	View file
drivers/staging/media/meson/vdec/codec_vp9.h	added	+13	−0	View file
drivers/staging/media/meson/vdec/esparser.c	modified	+166	−34	View file
drivers/staging/media/meson/vdec/hevc_regs.h	added	+218	−0	View file
drivers/staging/media/meson/vdec/vdec.c	modified	+68	−39	View file
drivers/staging/media/meson/vdec/vdec.h	modified	+12	−2	View file
drivers/staging/media/meson/vdec/vdec_helpers.c	modified	+75	−48	View file
drivers/staging/media/meson/vdec/vdec_helpers.h	modified	+8	−2	View file
drivers/staging/media/meson/vdec/vdec_hevc.c	added	+231	−0	View file
drivers/staging/media/meson/vdec/vdec_hevc.h	added	+13	−0	View file
drivers/staging/media/meson/vdec/vdec_platform.c	modified	+109	−0	View file
drivers/staging/media/omap4iss/iss_video.c	modified	+4	−4	View file
drivers/staging/media/rkisp1/TODO	modified	+0	−1	View file
drivers/staging/media/rkisp1/rkisp1-capture.c	modified	+5	−8	View file
drivers/staging/media/rkisp1/rkisp1-common.h	modified	+3	−0	View file
drivers/staging/media/rkisp1/rkisp1-dev.c	modified	+9	−11	View file
drivers/staging/media/rkisp1/rkisp1-isp.c	modified	+33	−28	View file
drivers/staging/media/rkisp1/rkisp1-params.c	modified	+1	−1	View file
drivers/staging/media/rkisp1/rkisp1-resizer.c	modified	+16	−11	View file
drivers/staging/media/rkisp1/rkisp1-stats.c	modified	+2	−3	View file
drivers/staging/media/soc_camera/soc_camera.c	modified	+1	−1	View file
drivers/staging/media/sunxi/cedrus/cedrus.c	modified	+1	−1	View file
drivers/staging/media/sunxi/cedrus/cedrus_h264.c	modified	+5	−1	View file
drivers/staging/media/tegra-vde/vde.c	modified	+9	−46	View file
drivers/media/usb/usbvision/Kconfig → drivers/staging/media/usbvision/Kconfig	renamed	+7	−2	View file
drivers/media/usb/usbvision/Makefile → drivers/staging/media/usbvision/Makefile	renamed	+0	−0	View file
drivers/staging/media/usbvision/TODO	added	+11	−0	View file
drivers/media/usb/usbvision/usbvision-cards.c → drivers/staging/media/usbvision/usbvision-cards.c	renamed	+0	−0	View file
drivers/media/usb/usbvision/usbvision-cards.h → drivers/staging/media/usbvision/usbvision-cards.h	renamed	+0	−0	View file
drivers/media/usb/usbvision/usbvision-core.c → drivers/staging/media/usbvision/usbvision-core.c	renamed	+0	−0	View file
drivers/media/usb/usbvision/usbvision-i2c.c → drivers/staging/media/usbvision/usbvision-i2c.c	renamed	+0	−0	View file
drivers/media/usb/usbvision/usbvision-video.c → drivers/staging/media/usbvision/usbvision-video.c	renamed	+1	−1	View file
drivers/media/usb/usbvision/usbvision.h → drivers/staging/media/usbvision/usbvision.h	renamed	+0	−0	View file
drivers/staging/most/video/video.c	modified	+2	−2	View file
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c	modified	+1	−1	View file
drivers/usb/gadget/function/f_uvc.c	modified	+1	−1	View file
include/dt-bindings/display/sdtv-standards.h	added	+76	−0	View file
include/dt-bindings/media/tvp5150.h	modified	+0	−2	View file
include/linux/atmel-isc-media.h	added	+58	−0	View file
include/media/cec-notifier.h	modified	+8	−31	View file
include/media/h264-ctrls.h	modified	+2	−0	View file
include/media/i2c/smiapp.h	deleted	+0	−63	View before deletion
include/media/rc-core.h	modified	+4	−4	View file
include/media/rc-map.h	modified	+3	−2	View file
include/media/v4l2-dev.h	modified	+2	−2	View file
include/media/v4l2-device.h	modified	+8	−8	View file
include/media/v4l2-fwnode.h	modified	+143	−0	View file
include/media/v4l2-mc.h	modified	+25	−15	View file
include/media/v4l2-mem2mem.h	modified	+133	−0	View file
include/media/v4l2-subdev.h	modified	+1	−1	View file
include/media/videobuf2-core.h	modified	+5	−2	View file
include/uapi/linux/media-bus-format.h	modified	+2	−1	View file
include/uapi/linux/v4l2-controls.h	modified	+6	−0	View file
include/uapi/linux/videodev2.h	modified	+9	−0	View file
samples/v4l/v4l2-pci-skeleton.c	modified	+1	−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 a0dfce8..9198a93 100644
--- a/.mailmap
+++ b/.mailmap
@@ -244,6 +244,7 @@ Santosh Shilimkar <[email protected]>
 Santosh Shilimkar <[email protected]>
 Sascha Hauer <[email protected]>
 S.Çağlar Onur <[email protected]>
+Sakari Ailus <[email protected]> <[email protected]>
 Sean Nyekjaer <[email protected]> <[email protected]>
 Sebastian Reichel <[email protected]> <[email protected]>
 Sebastian Reichel <[email protected]> <[email protected]>

Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt

View file

diff --git a/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt
index 0c0970c..883bcb2 100644
--- a/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt
+++ b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt
@@ -6,16 +6,22 @@ Required properties:
 
 Optional properties:
 - label: a symbolic name for the connector
+- sdtv-standards: limit the supported TV standards on a connector to the given
+                  ones. If not specified all TV standards are allowed.
+                  Possible TV standards are defined in
+                  include/dt-bindings/display/sdtv-standards.h.
 
 Required nodes:
 - Video port for TV input
 
 Example
 -------
+#include <dt-bindings/display/sdtv-standards.h>
 
 tv: connector {
 	compatible = "composite-video-connector";
 	label = "tv";
+	sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>;
 
 	port {
 		tv_connector_in: endpoint {

Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml b/Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
new file mode 100644
index 0000000..75196d1
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
@@ -0,0 +1,70 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/allwinner,sun8i-a83t-de2-rotate.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A83T DE2 Rotate Device Tree Bindings
+
+maintainers:
+  - Jernej Skrabec <[email protected]>
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+description: |-
+  The Allwinner A83T and A64 have a rotation core used for
+  rotating and flipping images.
+
+properties:
+  compatible:
+    oneOf:
+      - const: allwinner,sun8i-a83t-de2-rotate
+      - items:
+        - const: allwinner,sun50i-a64-de2-rotate
+        - const: allwinner,sun8i-a83t-de2-rotate
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Rotate interface clock
+      - description: Rotate module clock
+
+  clock-names:
+    items:
+      - const: bus
+      - const: mod
+
+  resets:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/clock/sun8i-de2.h>
+    #include <dt-bindings/reset/sun8i-de2.h>
+
+    rotate: rotate@1020000 {
+        compatible = "allwinner,sun8i-a83t-de2-rotate";
+        reg = <0x1020000 0x10000>;
+        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&display_clocks CLK_BUS_ROT>,
+                 <&display_clocks CLK_ROT>;
+        clock-names = "bus",
+                      "mod";
+        resets = <&display_clocks RST_ROT>;
+    };
+
+...

Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml b/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
index 2e40f70..8707df6 100644
--- a/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
+++ b/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
@@ -17,7 +17,11 @@ description: |-
 
 properties:
   compatible:
-    const: allwinner,sun8i-h3-deinterlace
+    oneOf:
+      - const: allwinner,sun8i-h3-deinterlace
+      - items:
+        - const: allwinner,sun50i-a64-deinterlace
+        - const: allwinner,sun8i-h3-deinterlace
 
   reg:
     maxItems: 1

Documentation/devicetree/bindings/media/aspeed-video.txt

View file

diff --git a/Documentation/devicetree/bindings/media/aspeed-video.txt b/Documentation/devicetree/bindings/media/aspeed-video.txt
index ce28945..d2ca325 100644
--- a/Documentation/devicetree/bindings/media/aspeed-video.txt
+++ b/Documentation/devicetree/bindings/media/aspeed-video.txt
@@ -1,11 +1,12 @@
 * Device tree bindings for Aspeed Video Engine
 
-The Video Engine (VE) embedded in the Aspeed AST2400 and AST2500 SOCs can
+The Video Engine (VE) embedded in the Aspeed AST2400/2500/2600 SOCs can
 capture and compress video data from digital or analog sources.
 
 Required properties:
  - compatible:		"aspeed,ast2400-video-engine" or
-			"aspeed,ast2500-video-engine"
+			"aspeed,ast2500-video-engine" or
+			"aspeed,ast2600-video-engine"
  - reg:			contains the offset and length of the VE memory region
  - clocks:		clock specifiers for the syscon clocks associated with
 			the VE (ordering must match the clock-names property)

Documentation/devicetree/bindings/media/i2c/imx219.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.yaml b/Documentation/devicetree/bindings/media/i2c/imx219.yaml
new file mode 100644
index 0000000..32d6b69
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/imx219.yaml
@@ -0,0 +1,114 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/imx219.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Sony 1/4.0-Inch 8Mpixel CMOS Digital Image Sensor
+
+maintainers:
+  - Dave Stevenson <[email protected]>
+
+description: |-
+  The Sony imx219 is a 1/4.0-inch CMOS active pixel digital image sensor
+  with an active array size of 3280H x 2464V. It is programmable through
+  I2C interface. The I2C address is fixed to 0x10 as per sensor data sheet.
+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
+  4 data lanes.
+
+properties:
+  compatible:
+    const: sony,imx219
+
+  reg:
+    description: I2C device address
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  VDIG-supply:
+    description:
+      Digital I/O voltage supply, 1.8 volts
+
+  VANA-supply:
+    description:
+      Analog voltage supply, 2.8 volts
+
+  VDDL-supply:
+    description:
+      Digital core voltage supply, 1.2 volts
+
+  reset-gpios:
+    description: |-
+      Reference to the GPIO connected to the xclr pin, if any.
+      Must be released (set high) after all supplies are applied.
+
+  # See ../video-interfaces.txt for more details
+  port:
+    type: object
+    properties:
+      endpoint:
+        type: object
+        properties:
+          data-lanes:
+            description: |-
+              The sensor supports either two-lane, or four-lane operation.
+              If this property is omitted four-lane operation is assumed.
+              For two-lane operation the property must be set to <1 2>.
+            items:
+              - const: 1
+              - const: 2
+
+          clock-noncontinuous:
+            type: boolean
+            description: |-
+              MIPI CSI-2 clock is non-continuous if this property is present,
+              otherwise it's continuous.
+
+          link-frequencies:
+            allOf:
+              - $ref: /schemas/types.yaml#/definitions/uint64-array
+            description:
+              Allowed data bus frequencies.
+
+        required:
+          - link-frequencies
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - VANA-supply
+  - VDIG-supply
+  - VDDL-supply
+  - port
+
+additionalProperties: false
+
+examples:
+  - |
+    i2c0 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        imx219: sensor@10 {
+            compatible = "sony,imx219";
+            reg = <0x10>;
+            clocks = <&imx219_clk>;
+            VANA-supply = <&imx219_vana>;   /* 2.8v */
+            VDIG-supply = <&imx219_vdig>;   /* 1.8v */
+            VDDL-supply = <&imx219_vddl>;   /* 1.2v */
+
+            port {
+                imx219_0: endpoint {
+                    remote-endpoint = <&csi1_ep>;
+                    data-lanes = <1 2>;
+                    clock-noncontinuous;
+                    link-frequencies = /bits/ 64 <456000000>;
+                };
+            };
+        };
+    };
+
+...

Documentation/devicetree/bindings/media/i2c/tvp5150.txt

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/tvp5150.txt b/Documentation/devicetree/bindings/media/i2c/tvp5150.txt
index 8c0fc1a..6c88ce8 100644
--- a/Documentation/devicetree/bindings/media/i2c/tvp5150.txt
+++ b/Documentation/devicetree/bindings/media/i2c/tvp5150.txt
@@ -5,38 +5,150 @@ The TVP5150 and TVP5151 are video decoders that convert baseband NTSC and PAL
 with discrete syncs or 8-bit ITU-R BT.656 with embedded syncs output formats.
 
 Required Properties:
-- compatible: value must be "ti,tvp5150"
-- reg: I2C slave address
+====================
+- compatible:	Value must be "ti,tvp5150".
+- reg:		I2C slave address.
 
 Optional Properties:
-- pdn-gpios: phandle for the GPIO connected to the PDN pin, if any.
-- reset-gpios: phandle for the GPIO connected to the RESETB pin, if any.
+====================
+- pdn-gpios:	Phandle for the GPIO connected to the PDN pin, if any.
+- reset-gpios:	Phandle for the GPIO connected to the RESETB pin, if any.
 
-The device node must contain one 'port' child node for its digital output
-video port, in accordance with the video interface bindings defined in
-Documentation/devicetree/bindings/media/video-interfaces.txt.
+The device node must contain one 'port' child node per device physical input
+and output port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt. The port nodes
+are numbered as follows
 
-Required Endpoint Properties for parallel synchronization:
+	  Name		Type		Port
+	--------------------------------------
+	  AIP1A		sink		0
+	  AIP1B		sink		1
+	  Y-OUT		src		2
 
-- hsync-active: active state of the HSYNC signal. Must be <1> (HIGH).
-- vsync-active: active state of the VSYNC signal. Must be <1> (HIGH).
-- field-even-active: field signal level during the even field data
-  transmission. Must be <0>.
+The device node must contain at least one sink port and the src port. Each input
+port must be linked to an endpoint defined in [1]. The port/connector layout is
+as follows
 
-If none of hsync-active, vsync-active and field-even-active is specified,
-the endpoint is assumed to use embedded BT.656 synchronization.
+tvp-5150 port@0 (AIP1A)
+	endpoint@0 -----------> Comp0-Con  port
+	endpoint@1 ------+----> Svideo-Con port
+tvp-5150 port@1 (AIP1B)  |
+	endpoint@1 ------+
+	endpoint@0 -----------> Comp1-Con  port
+tvp-5150 port@2
+	endpoint (video bitstream output at YOUT[0-7] parallel bus)
 
-Example:
+Required Endpoint Properties for parallel synchronization on output port:
+=========================================================================
+
+- hsync-active:		Active state of the HSYNC signal. Must be <1> (HIGH).
+- vsync-active:		Active state of the VSYNC signal. Must be <1> (HIGH).
+- field-even-active:	Field signal level during the even field data
+			transmission. Must be <0>.
+
+Note: Do not specify any of these properties if you want to use the embedded
+      BT.656 synchronization.
+
+Optional Connector Properties:
+==============================
+
+- sdtv-standards: Set the possible signals to which the hardware tries to lock
+                  instead of using the autodetection mechnism. Please look at
+                  [1] for more information.
+
+[1] Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt.
+
+Example - three input sources:
+#include <dt-bindings/display/sdtv-standards.h>
+
+comp_connector_0 {
+	compatible = "composite-video-connector";
+	label = "Composite0";
+	sdtv-standards = <SDTV_STD_PAL_M>; /* limit to pal-m signals */
+
+	port {
+		composite0_to_tvp5150: endpoint {
+			remote-endpoint = <&tvp5150_to_composite0>;
+		};
+	};
+};
+
+comp_connector_1 {
+	compatible = "composite-video-connector";
+	label = "Composite1";
+	sdtv-standards = <SDTV_STD_NTSC_M>; /* limit to ntsc-m signals */
+
+	port {
+		composite1_to_tvp5150: endpoint {
+			remote-endpoint = <&tvp5150_to_composite1>;
+		};
+	};
+};
+
+svideo_connector {
+	compatible = "svideo-connector";
+	label = "S-Video";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		svideo_luma_to_tvp5150: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&tvp5150_to_svideo_luma>;
+		};
+
+		svideo_chroma_to_tvp5150: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&tvp5150_to_svideo_chroma>;
+		};
+	};
+};
 
 &i2c2 {
-	...
 	tvp5150@5c {
 		compatible = "ti,tvp5150";
 		reg = <0x5c>;
 		pdn-gpios = <&gpio4 30 GPIO_ACTIVE_LOW>;
 		reset-gpios = <&gpio6 7 GPIO_ACTIVE_LOW>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+
+			tvp5150_to_composite0: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&composite0_to_tvp5150>;
+			};
+
+			tvp5150_to_svideo_luma: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&svideo_luma_to_tvp5150>;
+			};
+		};
+
+		port@1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+
+			tvp5150_to_composite1: endpoint@0 {
+				reg = <0>;
+                                remote-endpoint = <&composite1_to_tvp5150>;
+			};
+
+			tvp5150_to_svideo_chroma: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&svideo_chroma_to_tvp5150>;
+			};
+		};
+
+		port@2 {
+			reg = <2>;
 
-		port {
 			tvp5150_1: endpoint {
 				remote-endpoint = <&ccdc_ep>;
 			};

Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
new file mode 100644
index 0000000..a2d1cd7
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
@@ -0,0 +1,77 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/nxp,imx8mq-vpu.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Hantro G1/G2 VPU codecs implemented on i.MX8MQ SoCs
+
+maintainers:
+  - Philipp Zabel <[email protected]>
+
+description:
+  Hantro G1/G2 video decode accelerators present on i.MX8MQ SoCs.
+
+properties:
+  compatible:
+    const: nxp,imx8mq-vpu
+
+  reg:
+    maxItems: 3
+
+  reg-names:
+    items:
+      - const: g1
+      - const: g2
+      - const: ctrl
+
+  interrupts:
+    maxItems: 2
+
+  interrupt-names:
+    items:
+      - const: g1
+      - const: g2
+
+  clocks:
+    maxItems: 3
+
+  clock-names:
+    items:
+      - const: g1
+      - const: g2
+      - const: bus
+
+  power-domains:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - interrupts
+  - interrupt-names
+  - clocks
+  - clock-names
+
+examples:
+  - |
+        #include <dt-bindings/clock/imx8mq-clock.h>
+        #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+        vpu: video-codec@38300000 {
+                compatible = "nxp,imx8mq-vpu";
+                reg = <0x38300000 0x10000>,
+                      <0x38310000 0x10000>,
+                      <0x38320000 0x10000>;
+                reg-names = "g1", "g2", "ctrl";
+                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "g1", "g2";
+                clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
+                         <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
+                         <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
+                clock-names = "g1", "g2", "bus";
+                power-domains = <&pgc_vpu>;
+        };

Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml b/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml
new file mode 100644
index 0000000..f9606df
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml
@@ -0,0 +1,119 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/qcom,msm8916-venus.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Venus video encode and decode accelerators
+
+maintainers:
+  - Stanimir Varbanov <[email protected]>
+
+description: |
+  The Venus IP is a video encode and decode accelerator present
+  on Qualcomm platforms
+
+properties:
+  compatible:
+    const: qcom,msm8916-venus
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  clocks:
+    maxItems: 3
+
+  clock-names:
+    items:
+      - const: core
+      - const: iface
+      - const: bus
+
+  iommus:
+    maxItems: 1
+
+  memory-region:
+    maxItems: 1
+
+  video-decoder:
+    type: object
+
+    properties:
+      compatible:
+        const: "venus-decoder"
+
+    required:
+      - compatible
+
+    additionalProperties: false
+
+  video-encoder:
+    type: object
+
+    properties:
+      compatible:
+        const: "venus-encoder"
+
+    required:
+      - compatible
+
+    additionalProperties: false
+