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

846de71b · Linus Torvalds <[email protected]> · 2020-01-31 14:43:23 -08:00

Pull media updates from Mauro Carvalho Chehab:

 - New staging driver for Rockship ISPv1 unit

 - New staging driver for Rockchip MIPI Synopsys DPHY RX0

 - y2038 fixes at V4L2 API (backward-compatible)

 - A dvb core fix when receiving invalid EIT sections

 - Some clang-specific warnings got fixed

 - Added support for touch V4L2 interface at vivid

 - Several drivers were converted to use the new
   i2c_new_scanned_device() kAPI

 - Added sm1 support at meson's vdec driver

 - Several other driver cleanups, fixes and improvements

* tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (207 commits)
  media: staging/intel-ipu3: remove TODO item about acronyms
  media: v4l2-fwnode: Print the node name while parsing endpoints
  media: Revert "media: staging/intel-ipu3: make imgu use fixed running mode"
  media: mt9v111: constify copied structure
  media: platform: VIDEO_MEDIATEK_JPEG can also depend on MTK_IOMMU
  media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value
  media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors
  media: hantro: fix post-processing NULL pointer dereference
  media: rcar-vin: Use correct pixel format when aligning format
  media: MAINTAINERS: add entry for Rockchip ISP1 driver
  media: staging: rkisp1: add TODO file for staging
  media: staging: rkisp1: add document for rkisp1 meta buffer format
  media: staging: rkisp1: add output device for parameters
  media: staging: rkisp1: add capture device for statistics
  media: staging: rkisp1: add user space ABI definitions
  media: staging: rkisp1: add streaming paths
  media: staging: rkisp1: add Rockchip ISP1 base driver
  media: staging: phy-rockchip-dphy-rx0: add Rockchip MIPI Synopsys DPHY RX0 driver
  media: staging: dt-bindings: add Rockchip MIPI RX D-PHY RX0 yaml bindings
  media: staging: dt-bindings: add Rockchip ISP1 yaml bindings
  ...

Commit: 846de71bedefb530461ee70ec82f7c810ef14e59
Parents: 8fdd4019 · 1697d981

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

Changes

215 files changed · +14973 −2355

File	Status	Add	Del	Content
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml	modified	+13	−1	View file
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml	added	+141	−0	View file
Documentation/devicetree/bindings/media/amlogic,vdec.txt	deleted	+0	−72	View before deletion
Documentation/devicetree/bindings/media/hix5hd2-ir.txt	modified	+2	−1	View file
Documentation/devicetree/bindings/media/renesas,vin.txt	modified	+1	−3	View file
Documentation/devicetree/bindings/media/ti,cal.yaml	added	+202	−0	View file
Documentation/devicetree/bindings/media/ti-cal.txt	deleted	+0	−72	View before deletion
Documentation/media/kapi/dtv-frontend.rst	modified	+8	−8	View file
Documentation/media/uapi/cec/cec-ioc-g-mode.rst	modified	+1	−1	View file
Documentation/media/uapi/dvb/video-get-event.rst	modified	+1	−1	View file
Documentation/media/uapi/dvb/video_types.rst	modified	+1	−1	View file
Documentation/media/uapi/v4l/pixfmt-reserved.rst	modified	+1	−2	View file
Documentation/media/uapi/v4l/pixfmt-srggb12p.rst	modified	+1	−1	View file
Documentation/media/uapi/v4l/pixfmt-srggb14p.rst	modified	+1	−1	View file
Documentation/media/uapi/v4l/pixfmt-tch-td16.rst	modified	+17	−17	View file
Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst	modified	+17	−17	View file
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst	modified	+3	−1	View file
Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst	modified	+1	−1	View file
Documentation/media/v4l-drivers/cx18.rst	deleted	+0	−39	View before deletion
Documentation/media/v4l-drivers/index.rst	modified	+0	−1	View file
MAINTAINERS	modified	+9	−7	View file
drivers/media/cec/cec-core.c	modified	+1	−20	View file
drivers/media/cec/cec-notifier.c	modified	+2	−35	View file
drivers/media/cec/cec-priv.h	modified	+1	−1	View file
drivers/media/common/saa7146/saa7146_video.c	modified	+4	−2	View file
drivers/media/common/videobuf2/videobuf2-v4l2.c	modified	+2	−2	View file
drivers/media/dvb-core/dvb_demux.c	modified	+1	−0	View file
drivers/media/dvb-core/dvbdev.c	modified	+2	−2	View file
drivers/media/dvb-frontends/as102_fe.c	modified	+2	−1	View file
drivers/media/dvb-frontends/au8522_decoder.c	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2820r_core.c	modified	+2	−2	View file
drivers/media/dvb-frontends/dib0070.c	modified	+15	−8	View file
drivers/media/dvb-frontends/dib0090.c	modified	+2	−1	View file
drivers/media/dvb-frontends/dib7000m.c	modified	+1	−1	View file
drivers/media/dvb-frontends/dib7000p.c	modified	+1	−1	View file
drivers/media/dvb-frontends/dvb_dummy_fe.c	modified	+59	−32	View file
drivers/media/dvb-frontends/dvb_dummy_fe.h	modified	+6	−6	View file
drivers/media/dvb-frontends/lgdt330x.c	modified	+2	−2	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+2	−2	View file
drivers/media/dvb-frontends/ts2020.c	modified	+2	−2	View file
drivers/media/i2c/adv748x/adv748x.h	modified	+4	−4	View file
drivers/media/i2c/adv7604.c	modified	+21	−11	View file
drivers/media/i2c/mt9v032.c	modified	+8	−2	View file
drivers/media/i2c/mt9v111.c	modified	+1	−1	View file
drivers/media/i2c/ov5640.c	modified	+23	−18	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+114	−84	View file
drivers/media/i2c/smiapp/smiapp-regs.c	modified	+0	−3	View file
drivers/media/i2c/smiapp/smiapp.h	modified	+0	−1	View file
drivers/media/pci/bt8xx/bttv-input.c	modified	+3	−3	View file
drivers/media/pci/cobalt/cobalt-alsa-pcm.c	modified	+4	−65	View file
drivers/media/pci/cx18/cx18-alsa-pcm.c	modified	+1	−74	View file
drivers/media/pci/cx18/cx18-cards.c	modified	+4	−4	View file
drivers/media/pci/cx18/cx18-driver.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-i2c.c	modified	+1	−1	View file
drivers/media/pci/cx23885/cx23885-alsa.c	modified	+0	−1	View file
drivers/media/pci/cx23885/cx23885-cards.c	modified	+24	−0	View file
drivers/media/pci/cx23885/cx23885-dvb.c	modified	+54	−60	View file
drivers/media/pci/cx23885/cx23885-i2c.c	modified	+2	−2	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+2	−1	View file
drivers/media/pci/cx23885/cx23885.h	modified	+1	−0	View file
drivers/media/pci/cx25821/cx25821-alsa.c	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-alsa.c	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-input.c	modified	+1	−1	View file
drivers/media/pci/ivtv/Kconfig	modified	+2	−3	View file
drivers/media/pci/ivtv/ivtv-alsa-pcm.c	modified	+1	−75	View file
drivers/media/pci/ivtv/ivtv-driver.c	modified	+1	−2	View file
drivers/media/pci/ivtv/ivtv-driver.h	modified	+0	−1	View file
drivers/media/pci/ivtv/ivtv-i2c.c	modified	+3	−3	View file
drivers/media/pci/ivtv/ivtv-i2c.h	modified	+1	−1	View file
drivers/media/pci/meye/meye.c	modified	+2	−2	View file
drivers/media/pci/saa7134/saa7134-alsa.c	modified	+0	−1	View file
drivers/media/pci/saa7164/saa7164-dvb.c	modified	+10	−14	View file
drivers/media/pci/smipcie/smipcie-main.c	modified	+2	−2	View file
drivers/media/pci/solo6x10/solo6x10-g723.c	modified	+5	−19	View file
drivers/media/pci/tw686x/tw686x-audio.c	modified	+1	−15	View file
drivers/media/platform/Kconfig	modified	+2	−2	View file
drivers/media/platform/atmel/atmel-isc-base.c	modified	+75	−19	View file
drivers/media/platform/atmel/atmel-isi.c	modified	+40	−2	View file
drivers/media/platform/atmel/atmel-isi.h	modified	+2	−0	View file
drivers/media/platform/coda/coda-bit.c	modified	+20	−9	View file
drivers/media/platform/coda/coda-common.c	modified	+39	−6	View file
drivers/media/platform/coda/coda-jpeg.c	modified	+722	−24	View file
drivers/media/platform/coda/coda.h	modified	+3	−0	View file
drivers/media/platform/coda/coda_regs.h	modified	+83	−0	View file
drivers/media/platform/coda/trace.h	modified	+10	−0	View file
drivers/media/platform/davinci/vpfe_capture.c	modified	+16	−15	View file
drivers/media/platform/mtk-mdp/mtk_mdp_core.c	modified	+3	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c	modified	+36	−30	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h	modified	+3	−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.c	modified	+11	−12	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h	modified	+4	−4	View file
drivers/media/platform/omap3isp/isp.c	modified	+4	−4	View file
drivers/media/platform/omap3isp/ispccdc.c	modified	+8	−4	View file
drivers/media/platform/pxa_camera.c	modified	+2	−0	View file
drivers/media/platform/rcar-vin/rcar-v4l2.c	modified	+1	−1	View file
drivers/media/platform/sti/bdisp/bdisp-hw.c	modified	+3	−3	View file
drivers/media/platform/sti/bdisp/bdisp-v4l2.c	modified	+9	−4	View file
drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c	modified	+3	−2	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c	modified	+52	−5	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h	modified	+4	−2	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c	modified	+14	−6	View file
drivers/media/platform/sunxi/sun8i-di/sun8i-di.c	modified	+1	−4	View file
drivers/media/platform/ti-vpe/cal.c	modified	+609	−164	View file
drivers/media/platform/ti-vpe/cal_regs.h	modified	+124	−97	View file
drivers/media/platform/ti-vpe/csc.c	modified	+12	−20	View file
drivers/media/platform/vimc/vimc-scaler.c	modified	+151	−15	View file
drivers/media/platform/vivid/Makefile	modified	+2	−1	View file
drivers/media/platform/vivid/vivid-core.c	modified	+188	−15	View file
drivers/media/platform/vivid/vivid-core.h	modified	+20	−0	View file
drivers/media/platform/vivid/vivid-ctrls.c	modified	+11	−0	View file
drivers/media/platform/vivid/vivid-kthread-touch.c	added	+181	−0	View file
drivers/media/platform/vivid/vivid-kthread-touch.h	added	+13	−0	View file
drivers/media/platform/vivid/vivid-touch-cap.c	added	+341	−0	View file
drivers/media/platform/vivid/vivid-touch-cap.h	added	+39	−0	View file
drivers/media/platform/vivid/vivid-vid-common.c	modified	+1	−1	View file
drivers/media/rc/iguanair.c	modified	+1	−1	View file
drivers/media/rc/ir-hix5hd2.c	modified	+61	−18	View file
drivers/media/rc/rc-main.c	modified	+16	−11	View file
drivers/media/rc/serial_ir.c	modified	+1	−1	View file
drivers/media/usb/cpia2/cpia2_v4l.c	modified	+2	−2	View file
drivers/media/usb/cx231xx/cx231xx-audio.c	modified	+1	−78	View file
drivers/media/usb/cx231xx/cx231xx-i2c.c	modified	+2	−1	View file
drivers/media/usb/dvb-usb-v2/af9035.c	modified	+12	−7	View file
drivers/media/usb/dvb-usb-v2/anysee.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+23	−19	View file
drivers/media/usb/dvb-usb-v2/zd1301.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb/af9005.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/cxusb.c	modified	+15	−18	View file
drivers/media/usb/dvb-usb/dib0700_devices.c	modified	+4	−4	View file
drivers/media/usb/dvb-usb/digitv.c	modified	+7	−3	View file
drivers/media/usb/dvb-usb/dvb-usb-urb.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+4	−4	View file
drivers/media/usb/dvb-usb/vp7045.c	modified	+14	−7	View file
drivers/media/usb/em28xx/em28xx-audio.c	modified	+1	−86	View file
drivers/media/usb/go7007/s2250-board.c	modified	+1	−0	View file
drivers/media/usb/go7007/snd-go7007.c	modified	+20	−40	View file
drivers/media/usb/gspca/gspca.c	modified	+1	−1	View file
drivers/media/usb/pulse8-cec/pulse8-cec.c	modified	+457	−312	View file
drivers/media/usb/pvrusb2/pvrusb2-encoder.c	modified	+2	−2	View file
drivers/media/usb/stkwebcam/stk-webcam.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-alsa.c	modified	+1	−81	View file
drivers/media/usb/usbtv/usbtv-audio.c	modified	+1	−28	View file
drivers/media/usb/usbvision/usbvision-video.c	modified	+2	−2	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+37	−0	View file
drivers/media/usb/uvc/uvcvideo.h	modified	+1	−0	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+401	−75	View file
drivers/media/v4l2-core/v4l2-event.c	modified	+4	−1	View file
drivers/media/v4l2-core/v4l2-fwnode.c	modified	+3	−3	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+168	−45	View file
drivers/media/v4l2-core/v4l2-subdev.c	modified	+25	−1	View file
drivers/media/v4l2-core/videobuf-core.c	modified	+3	−2	View file
drivers/staging/media/Kconfig	modified	+4	−0	View file
drivers/staging/media/Makefile	modified	+2	−0	View file
drivers/staging/media/hantro/Makefile	modified	+1	−0	View file
drivers/staging/media/hantro/hantro.h	modified	+62	−4	View file
drivers/staging/media/hantro/hantro_drv.c	modified	+8	−3	View file
drivers/staging/media/hantro/hantro_g1_h264_dec.c	modified	+2	−2	View file
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c	modified	+3	−3	View file
drivers/staging/media/hantro/hantro_g1_regs.h	modified	+53	−0	View file
drivers/staging/media/hantro/hantro_g1_vp8_dec.c	modified	+3	−3	View file
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c	modified	+2	−2	View file
drivers/staging/media/hantro/hantro_h264.c	modified	+1	−1	View file
drivers/staging/media/hantro/hantro_hw.h	modified	+15	−2	View file
drivers/staging/media/hantro/hantro_postproc.c	added	+148	−0	View file
drivers/staging/media/hantro/hantro_v4l2.c	modified	+73	−36	View file
drivers/staging/media/hantro/rk3288_vpu_hw.c	modified	+10	−0	View file
drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c	modified	+2	−2	View file
drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c	modified	+2	−2	View file
drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c	modified	+2	−2	View file
drivers/staging/media/imx/imx7-mipi-csis.c	modified	+0	−3	View file
drivers/staging/media/ipu3/TODO	modified	+0	−6	View file
drivers/staging/media/ipu3/ipu3-css.c	modified	+1	−1	View file
drivers/staging/media/ipu3/ipu3-v4l2.c	modified	+5	−0	View file
drivers/staging/media/meson/vdec/vdec.c	modified	+16	−2	View file
drivers/staging/media/meson/vdec/vdec.h	modified	+1	−0	View file
drivers/staging/media/meson/vdec/vdec_1.c	modified	+23	−6	View file
drivers/staging/media/meson/vdec/vdec_platform.c	modified	+60	−0	View file
drivers/staging/media/meson/vdec/vdec_platform.h	modified	+4	−0	View file
drivers/staging/media/phy-rockchip-dphy-rx0/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml	added	+76	−0	View file
drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig	added	+13	−0	View file
drivers/staging/media/phy-rockchip-dphy-rx0/Makefile	added	+2	−0	View file
drivers/staging/media/phy-rockchip-dphy-rx0/TODO	added	+6	−0	View file
drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c	added	+388	−0	View file
drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml	added	+192	−0	View file
drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-params.rst	added	+23	−0	View file
drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst	added	+22	−0	View file
drivers/staging/media/rkisp1/Kconfig	added	+17	−0	View file
drivers/staging/media/rkisp1/Makefile	added	+8	−0	View file
drivers/staging/media/rkisp1/TODO	added	+23	−0	View file
drivers/staging/media/rkisp1/rkisp1-capture.c	added	+1437	−0	View file
drivers/staging/media/rkisp1/rkisp1-common.c	added	+37	−0	View file
drivers/staging/media/rkisp1/rkisp1-common.h	added	+337	−0	View file
drivers/staging/media/rkisp1/rkisp1-dev.c	added	+574	−0	View file
drivers/staging/media/rkisp1/rkisp1-isp.c	added	+1164	−0	View file
drivers/staging/media/rkisp1/rkisp1-params.c	added	+1630	−0	View file
drivers/staging/media/rkisp1/rkisp1-regs.h	added	+1264	−0	View file
drivers/staging/media/rkisp1/rkisp1-resizer.c	added	+775	−0	View file
drivers/staging/media/rkisp1/rkisp1-stats.c	added	+530	−0	View file
drivers/staging/media/rkisp1/uapi/rkisp1-config.h	added	+819	−0	View file
drivers/staging/media/sunxi/cedrus/cedrus_h265.c	modified	+23	−3	View file
drivers/staging/media/sunxi/cedrus/cedrus_regs.h	modified	+1	−0	View file
drivers/staging/media/tegra-vde/Kconfig	modified	+1	−1	View file
drivers/staging/media/tegra-vde/vde.c	modified	+2	−4	View file
drivers/staging/media/tegra-vde/vde.h	modified	+1	−1	View file
include/media/cec-notifier.h	modified	+0	−27	View file
include/media/cec.h	modified	+0	−46	View file
include/media/dvb-usb-ids.h	modified	+2	−0	View file
include/media/v4l2-common.h	modified	+21	−0	View file
include/media/v4l2-device.h	modified	+6	−6	View file
include/media/v4l2-ioctl.h	modified	+55	−0	View file
include/media/v4l2-rect.h	modified	+4	−4	View file
include/media/v4l2-subdev.h	modified	+1	−1	View file
include/trace/events/v4l2.h	modified	+1	−1	View file
include/uapi/linux/videodev2.h	modified	+29	−0	View file

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

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
index 0f6374c..9af873b 100644
--- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
@@ -16,7 +16,15 @@ description: |-
 
 properties:
   compatible:
-    const: allwinner,sun7i-a20-csi0
+    oneOf:
+      - const: allwinner,sun4i-a10-csi1
+      - const: allwinner,sun7i-a20-csi0
+      - items:
+        - const: allwinner,sun7i-a20-csi1
+        - const: allwinner,sun4i-a10-csi1
+      - items:
+        - const: allwinner,sun8i-r40-csi0
+        - const: allwinner,sun7i-a20-csi0
 
   reg:
     maxItems: 1
@@ -25,12 +33,16 @@ properties:
     maxItems: 1
 
   clocks:
+    minItems: 2
+    maxItems: 3
     items:
       - description: The CSI interface clock
       - description: The CSI ISP clock
       - description: The CSI DRAM clock
 
   clock-names:
+    minItems: 2
+    maxItems: 3
     items:
       - const: bus
       - const: isp

Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
new file mode 100644
index 0000000..335717e
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
@@ -0,0 +1,141 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+# Copyright 2019 BayLibre, SAS
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/amlogic,gx-vdec.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Amlogic Video Decoder
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+  - Maxime Jourdan <[email protected]>
+
+description: |
+  The video decoding IP lies within the DOS memory region,
+  except for the hardware bitstream parser that makes use of an undocumented
+  region.
+
+  It makes use of the following blocks:
+  - ESPARSER is a bitstream parser that outputs to a VIFIFO. Further VDEC blocks
+    then feed from this VIFIFO.
+  - VDEC_1 can decode MPEG-1, MPEG-2, MPEG-4 part 2, MJPEG, H.263, H.264, VC-1.
+  - VDEC_HEVC can decode HEVC and VP9.
+
+  Both VDEC_1 and VDEC_HEVC share the "vdec" IRQ and as such cannot run
+  concurrently.
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+        - enum:
+          - amlogic,gxbb-vdec # GXBB (S905)
+          - amlogic,gxl-vdec # GXL (S905X, S905D)
+          - amlogic,gxm-vdec # GXM (S912)
+        - const: amlogic,gx-vdec
+      - enum:
+        - amlogic,g12a-vdec # G12A (S905X2, S905D2)
+        - amlogic,sm1-vdec # SM1 (S905X3, S905D3)
+
+  interrupts:
+    minItems: 2
+
+  interrupt-names:
+    items:
+      - const: vdec
+      - const: esparser
+
+  reg:
+    minItems: 2
+
+  reg-names:
+    items:
+      - const: dos
+      - const: esparser
+
+  resets:
+    maxItems: 1
+
+  reset-names:
+    items:
+      - const: esparser
+
+  clocks:
+    minItems: 4
+    maxItems: 5
+
+  clock-names:
+    minItems: 4
+    maxItems: 5
+    items:
+      - const: dos_parser
+      - const: dos
+      - const: vdec_1
+      - const: vdec_hevc
+      - const: vdec_hevcf
+
+  amlogic,ao-sysctrl:
+    description: should point to the AOBUS sysctrl node
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/phandle
+
+  amlogic,canvas:
+    description: should point to a canvas provider node
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/phandle
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - amlogic,gx-vdec
+
+    then:
+      properties:
+        clock-names:
+          maxItems: 4
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - amlogic,g12a-vdec
+              - amlogic,sm1-vdec
+
+    then:
+      properties:
+        clock-names:
+          minItems: 5
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - interrupts
+  - interrupt-names
+  - clocks
+  - clock-names
+  - resets
+  - reset-names
+  - amlogic,ao-sysctrl
+  - amlogic,canvas
+
+examples:
+  - |
+    vdec: video-decoder@c8820000 {
+          compatible = "amlogic,gxl-vdec", "amlogic,gx-vdec";
+          reg = <0xc8820000 0x10000>, <0xc110a580 0xe4>;
+          reg-names = "dos", "esparser";
+          interrupts = <44>, <32>;
+          interrupt-names = "vdec", "esparser";
+          clocks = <&clk_dos_parser> ,<&clk_dos>, <&clk_vdec_1>, <&clk_vdec_hevc>;
+          clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc";
+          resets = <&reset_parser>;
+          reset-names = "esparser";
+          amlogic,ao-sysctrl = <&sysctrl_AO>;
+          amlogic,canvas = <&canvas>;
+    };

Documentation/devicetree/bindings/media/amlogic,vdec.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/amlogic,vdec.txt b/Documentation/devicetree/bindings/media/amlogic,vdec.txt
deleted file mode 100644
index 9b6aace..0000000
--- a/Documentation/devicetree/bindings/media/amlogic,vdec.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Amlogic Video Decoder
-================================
-
-The video decoding IP lies within the DOS memory region,
-except for the hardware bitstream parser that makes use of an undocumented
-region.
-
-It makes use of the following blocks:
-
-- ESPARSER is a bitstream parser that outputs to a VIFIFO. Further VDEC blocks
-then feed from this VIFIFO.
-- VDEC_1 can decode MPEG-1, MPEG-2, MPEG-4 part 2, MJPEG, H.263, H.264, VC-1.
-- VDEC_HEVC can decode HEVC and VP9.
-
-Both VDEC_1 and VDEC_HEVC share the "vdec" IRQ and as such cannot run
-concurrently.
-
-Device Tree Bindings:
----------------------
-
-VDEC: Video Decoder
---------------------------
-
-Required properties:
-- compatible: value should be different for each SoC family as :
-	- GXBB (S905) : "amlogic,gxbb-vdec"
-	- GXL (S905X, S905D) : "amlogic,gxl-vdec"
-	- GXM (S912) : "amlogic,gxm-vdec"
-	followed by the common "amlogic,gx-vdec"
-- reg: base address and size of he following memory-mapped regions :
-	- dos
-	- esparser
-- reg-names: should contain the names of the previous memory regions
-- interrupts: should contain the following IRQs:
-	- vdec
-	- esparser
-- interrupt-names: should contain the names of the previous interrupts
-- amlogic,ao-sysctrl: should point to the AOBUS sysctrl node
-- amlogic,canvas: should point to a canvas provider node
-- clocks: should contain the following clocks :
-	- dos_parser
-	- dos
-	- vdec_1
-	- vdec_hevc
-- clock-names: should contain the names of the previous clocks
-- resets: should contain the parser reset
-- reset-names: should be "esparser"
-
-Example:
-
-vdec: video-codec@c8820000 {
-	compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec";
-	reg = <0x0 0xc8820000 0x0 0x10000>,
-	      <0x0 0xc110a580 0x0 0xe4>;
-	reg-names = "dos", "esparser";
-
-	interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>,
-		     <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>;
-	interrupt-names = "vdec", "esparser";
-
-	amlogic,ao-sysctrl = <&sysctrl_AO>;
-	amlogic,canvas = <&canvas>;
-
-	clocks = <&clkc CLKID_DOS_PARSER>,
-		 <&clkc CLKID_DOS>,
-		 <&clkc CLKID_VDEC_1>,
-		 <&clkc CLKID_VDEC_HEVC>;
-	clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc";
-
-	resets = <&reset RESET_PARSER>;
-	reset-names = "esparser";
-};

Documentation/devicetree/bindings/media/hix5hd2-ir.txt

View file

diff --git a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
index 13ebc0f..ca4cf77 100644
--- a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
+++ b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
@@ -1,7 +1,8 @@
 Device-Tree bindings for hix5hd2 ir IP
 
 Required properties:
-	- compatible: Should contain "hisilicon,hix5hd2-ir".
+	- compatible: Should contain "hisilicon,hix5hd2-ir", or:
+		- "hisilicon,hi3796cv300-ir" for Hi3796CV300 IR device.
 	- reg: Base physical address of the controller and length of memory
 	  mapped region.
 	- interrupts: interrupt-specifier for the sole interrupt generated by

Documentation/devicetree/bindings/media/renesas,vin.txt

View file

diff --git a/Documentation/devicetree/bindings/media/renesas,vin.txt b/Documentation/devicetree/bindings/media/renesas,vin.txt
index e30b0d4..5eefd62 100644
--- a/Documentation/devicetree/bindings/media/renesas,vin.txt
+++ b/Documentation/devicetree/bindings/media/renesas,vin.txt
@@ -13,6 +13,7 @@ on Gen3 and RZ/G2 platforms to a CSI-2 receiver.
    - "renesas,vin-r8a7743" for the R8A7743 device
    - "renesas,vin-r8a7744" for the R8A7744 device
    - "renesas,vin-r8a7745" for the R8A7745 device
+   - "renesas,vin-r8a77470" for the R8A77470 device
    - "renesas,vin-r8a774a1" for the R8A774A1 device
    - "renesas,vin-r8a774b1" for the R8A774B1 device
    - "renesas,vin-r8a774c0" for the R8A774C0 device
@@ -41,9 +42,6 @@ on Gen3 and RZ/G2 platforms to a CSI-2 receiver.
  - interrupts: the interrupt for the device
  - clocks: Reference to the parent clock
 
-Additionally, an alias named vinX will need to be created to specify
-which video input device this is.
-
 The per-board settings for Gen2 and RZ/G1 platforms:
 
 - port - sub-node describing a single endpoint connected to the VIN

Documentation/devicetree/bindings/media/ti,cal.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/ti,cal.yaml b/Documentation/devicetree/bindings/media/ti,cal.yaml
new file mode 100644
index 0000000..1ea7841
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti,cal.yaml
@@ -0,0 +1,202 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/ti,cal.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL) Device Tree Bindings
+
+maintainers:
+  - Benoit Parrot <[email protected]>
+
+description: |-
+  The Camera Adaptation Layer (CAL) is a key component for image capture
+  applications. The capture module provides the system interface and the
+  processing capability to connect CSI2 image-sensor modules to the
+  DRA72x device.
+
+  CAL supports 2 camera port nodes on MIPI bus. Each CSI2 camera port nodes
+  should contain a 'port' child node with child 'endpoint' node. Please
+  refer to the bindings defined in
+  Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+properties:
+  compatible:
+    enum:
+      # for DRA72 controllers
+      - ti,dra72-cal
+      # for DRA72 controllers pre ES2.0
+      - ti,dra72-pre-es2-cal
+      # for DRA76 controllers
+      - ti,dra76-cal
+      # for AM654 controllers
+      - ti,am654-cal
+
+  reg:
+    minItems: 2
+    items:
+      - description: The CAL main register region
+      - description: The RX Core0 (DPHY0) register region
+      - description: The RX Core1 (DPHY1) register region
+
+  reg-names:
+    minItems: 2
+    items:
+      - const: cal_top
+      - const: cal_rx_core0
+      - const: cal_rx_core1
+
+  interrupts:
+    maxItems: 1
+
+  ti,camerrx-control:
+    $ref: "/schemas/types.yaml#/definitions/phandle-array"
+    description:
+      phandle to the device control module and offset to the
+      control_camerarx_core register
+
+  clocks:
+    maxItems: 1
+
+  clock-names:
+    const: fck
+
+  power-domains:
+    description:
+      List of phandle and PM domain specifier as documented in
+      Documentation/devicetree/bindings/power/power_domain.txt
+    maxItems: 1
+
+  # See ./video-interfaces.txt for details
+  ports:
+    type: object
+    additionalProperties: false
+
+    properties:
+      "#address-cells":
+        const: 1
+
+      "#size-cells":
+        const: 0
+
+      port@0:
+        type: object
+        additionalProperties: false
+
+        properties:
+          reg:
+            const: 0
+            description: CSI2 Port #0
+
+        patternProperties:
+          endpoint:
+            type: object
+            additionalProperties: false
+
+            properties:
+              clock-lanes:
+                maxItems: 1
+
+              data-lanes:
+                minItems: 1
+                maxItems: 4
+
+              remote-endpoint: true
+
+        required:
+          - reg
+
+      port@1:
+        type: object
+        additionalProperties: false
+
+        properties:
+          reg:
+            const: 1
+            description: CSI2 Port #1
+
+        patternProperties:
+          endpoint:
+            type: object
+            additionalProperties: false
+
+            properties:
+              clock-lanes:
+                maxItems: 1
+
+              data-lanes:
+                minItems: 1
+                maxItems: 4
+
+              remote-endpoint: true
+
+        required:
+          - reg
+
+    required:
+      - "#address-cells"
+      - "#size-cells"
+      - port@0
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - interrupts
+  - ti,camerrx-control
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    cal: cal@4845b000 {
+        compatible = "ti,dra72-cal";
+        reg = <0x4845B000 0x400>,
+              <0x4845B800 0x40>,
+              <0x4845B900 0x40>;
+        reg-names = "cal_top",
+                    "cal_rx_core0",
+                    "cal_rx_core1";
+        interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+        ti,camerrx-control = <&scm_conf 0xE94>;
+
+        ports {
+              #address-cells = <1>;
+              #size-cells = <0>;
+
+              csi2_0: port@0 {
+                    reg = <0>;
+                    csi2_phy0: endpoint {
+                           remote-endpoint = <&csi2_cam0>;
+                           clock-lanes = <0>;
+                           data-lanes = <1 2>;
+                    };
+              };
+        };
+    };
+
+    i2c5: i2c@4807c000 {
+        clock-frequency = <400000>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        camera-sensor@3c {
+               compatible = "ovti,ov5640";
+               reg = <0x3c>;
+
+               clocks = <&clk_ov5640_fixed>;
+               clock-names = "xclk";
+
+               port {
+                    csi2_cam0: endpoint {
+                            remote-endpoint = <&csi2_phy0>;
+                            clock-lanes = <0>;
+                            data-lanes = <1 2>;
+                    };
+               };
+        };
+    };
+
+...

Documentation/devicetree/bindings/media/ti-cal.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/ti-cal.txt b/Documentation/devicetree/bindings/media/ti-cal.txt
deleted file mode 100644
index ae9b52f..0000000
--- a/Documentation/devicetree/bindings/media/ti-cal.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL)
-------------------------------------------------------
-
-The Camera Adaptation Layer (CAL) is a key component for image capture
-applications. The capture module provides the system interface and the
-processing capability to connect CSI2 image-sensor modules to the
-DRA72x device.
-
-Required properties:
-- compatible: must be "ti,dra72-cal"
-- reg:	CAL Top level, Receiver Core #0, Receiver Core #1 and Camera RX
-	control address space
-- reg-names: cal_top, cal_rx_core0, cal_rx_core1, and camerrx_control
-	     registers
-- interrupts: should contain IRQ line for the CAL;
-
-CAL supports 2 camera port nodes on MIPI bus. Each CSI2 camera port nodes
-should contain a 'port' child node with child 'endpoint' node. Please
-refer to the bindings defined in
-Documentation/devicetree/bindings/media/video-interfaces.txt.
-
-Example:
-	cal: cal@4845b000 {
-		compatible = "ti,dra72-cal";
-		ti,hwmods = "cal";
-		reg = <0x4845B000 0x400>,
-		      <0x4845B800 0x40>,
-		      <0x4845B900 0x40>,
-		      <0x4A002e94 0x4>;
-		reg-names = "cal_top",
-			    "cal_rx_core0",
-			    "cal_rx_core1",
-			    "camerrx_control";
-		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			csi2_0: port@0 {
-				reg = <0>;
-				endpoint {
-					slave-mode;
-					remote-endpoint = <&ar0330_1>;
-				};
-			};
-			csi2_1: port@1 {
-				reg = <1>;
-			};
-		};
-	};
-
-	i2c5: i2c@4807c000 {
-		ar0330@10 {
-			compatible = "ti,ar0330";
-			reg = <0x10>;
-
-			port {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				ar0330_1: endpoint {
-					reg = <0>;
-					clock-lanes = <1>;
-					data-lanes = <0 2 3 4>;
-					remote-endpoint = <&csi2_0>;
-				};
-			};
-		};
-	};

Documentation/media/kapi/dtv-frontend.rst

View file

diff --git a/Documentation/media/kapi/dtv-frontend.rst b/Documentation/media/kapi/dtv-frontend.rst
index fbc5517..b362109 100644
--- a/Documentation/media/kapi/dtv-frontend.rst
+++ b/Documentation/media/kapi/dtv-frontend.rst
@@ -15,8 +15,8 @@ The header file for this API is named ``dvb_frontend.h`` and located in
 Demodulator driver
 ^^^^^^^^^^^^^^^^^^
 
-The demodulator driver is responsible to talk with the decoding part of the
-hardware. Such driver should implement :c:type:`dvb_frontend_ops`, with
+The demodulator driver is responsible for talking with the decoding part of the
+hardware. Such driver should implement :c:type:`dvb_frontend_ops`, which
 tells what type of digital TV standards are supported, and points to a
 series of functions that allow the DVB core to command the hardware via
 the code under ``include/media/dvb_frontend.c``.

This diff is incomplete. Download the complete patch.