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

fa73e212 · Linus Torvalds <[email protected]> · 2020-08-07 13:00:53 -07:00

Pull media updates from Mauro Carvalho Chehab:

 - Legacy soc_camera driver was removed from staging

 - New I2C sensor related drivers: dw9768, ch7322, max9271, rdacm20

 - TI vpe driver code was re-organized and had new features added

 - Added Xilinx MIPI CSI-2 Rx Subsystem driver

 - Added support for Infrared Toy and IR Droid devices

 - Lots of random driver fixes, new features and cleanups

* tag 'media/v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (318 commits)
  media: camss: fix memory leaks on error handling paths in probe
  media: davinci: vpif_capture: fix potential double free
  media: radio: remove redundant assignment to variable retval
  media: allegro: fix potential null dereference on header
  media: mtk-mdp: Fix a refcounting bug on error in init
  media: allegro: fix an error pointer vs NULL check
  media: meye: fix missing pm_mchip_mode field
  media: cafe-driver: use generic power management
  media: saa7164: use generic power management
  media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP
  media: v4l2: Correct kernel-doc inconsistency
  media: v4l2: Correct kernel-doc inconsistency
  media: dvbdev.h: keep * together with the type
  media: v4l2-subdev.h: keep * together with the type
  media: videobuf2: Print videobuf2 buffer state by name
  media: colorspaces-details.rst: fix V4L2_COLORSPACE_JPEG description
  media: tw68: use generic power management
  media: meye: use generic power management
  media: cx88: use generic power management
  media: cx25821: use generic power management
  ...

Commit: fa73e212318a3277ae1f304febbc617c75d4d2db
Parents: 75dee3b6 · f45882cf

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

Changes

268 files changed · +12785 −12116

File	Status	Add	Del	Content
Documentation/admin-guide/media/fimc.rst	modified	+3	−3	View file
Documentation/admin-guide/media/vivid.rst	modified	+9	−0	View file
Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml	added	+67	−0	View file
Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml	added	+100	−0	View file
Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml	added	+159	−0	View file
Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml	added	+366	−0	View file
Documentation/devicetree/bindings/media/renesas,fcp.txt	deleted	+0	−34	View before deletion
Documentation/devicetree/bindings/media/renesas,fcp.yaml	added	+66	−0	View file
Documentation/devicetree/bindings/media/renesas,fdp1.txt	deleted	+0	−37	View before deletion
Documentation/devicetree/bindings/media/renesas,fdp1.yaml	added	+69	−0	View file
Documentation/devicetree/bindings/media/renesas,vsp1.txt	deleted	+0	−30	View before deletion
Documentation/devicetree/bindings/media/renesas,vsp1.yaml	added	+97	−0	View file
Documentation/devicetree/bindings/media/xilinx/xlnx,csi2rxss.yaml	added	+237	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.yaml	modified	+2	−0	View file
Documentation/driver-api/media/drivers/pvrusb2.rst	modified	+1	−1	View file
Documentation/driver-api/media/drivers/tuners.rst	modified	+1	−1	View file
Documentation/userspace-api/media/cec/cec-ioc-adap-g-caps.rst	modified	+3	−0	View file
Documentation/userspace-api/media/dvb/fe-get-info.rst	modified	+1	−2	View file
Documentation/userspace-api/media/v4l/buffer.rst	modified	+40	−4	View file
Documentation/userspace-api/media/v4l/colorspaces-details.rst	modified	+2	−2	View file
Documentation/userspace-api/media/v4l/dev-decoder.rst	modified	+6	−4	View file
Documentation/userspace-api/media/v4l/dev-encoder.rst	added	+753	−0	View file
Documentation/userspace-api/media/v4l/dev-mem2mem.rst	modified	+1	−0	View file
Documentation/userspace-api/media/v4l/dev-osd.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/dev-sdr.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/hist-v4l2.rst	modified	+2	−2	View file
Documentation/userspace-api/media/v4l/pixfmt-srggb14p.rst	modified	+14	−14	View file
Documentation/userspace-api/media/v4l/pixfmt-v4l2.rst	modified	+5	−0	View file
Documentation/userspace-api/media/v4l/v4l2.rst	modified	+2	−0	View file
Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst	modified	+6	−1	View file
Documentation/userspace-api/media/v4l/vidioc-dqevent.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/vidioc-encoder-cmd.rst	modified	+31	−20	View file
Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst	modified	+25	−5	View file
Documentation/userspace-api/media/v4l/vidioc-g-parm.rst	modified	+32	−19	View file
Documentation/userspace-api/media/v4l/vidioc-querycap.rst	modified	+2	−2	View file
Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst	modified	+19	−2	View file
Documentation/userspace-api/media/videodev2.h.rst.exceptions	modified	+1	−0	View file
MAINTAINERS	modified	+54	−10	View file
arch/arm/configs/ezx_defconfig	modified	+0	−2	View file
arch/arm/configs/imote2_defconfig	modified	+0	−2	View file
arch/arm/configs/imx_v4_v5_defconfig	modified	+0	−1	View file
arch/arm/configs/imx_v6_v7_defconfig	modified	+0	−1	View file
arch/arm/configs/pxa_defconfig	modified	+0	−3	View file
arch/arm/configs/sama5_defconfig	modified	+0	−2	View file
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	modified	+0	−31	View file
arch/arm/mach-omap1/board-ams-delta.c	modified	+0	−32	View file
arch/arm/mach-omap1/camera.h	deleted	+0	−14	View before deletion
arch/arm/mach-omap1/devices.c	modified	+0	−43	View file
arch/arm/mach-pxa/palmz72.c	modified	+0	−112	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+0	−157	View file
arch/sh/configs/ap325rxa_defconfig	modified	+0	−3	View file
arch/sh/configs/ecovec24_defconfig	modified	+0	−3	View file
arch/sh/configs/migor_defconfig	modified	+0	−3	View file
arch/sh/configs/se7724_defconfig	modified	+0	−2	View file
drivers/media/cec/Kconfig	modified	+1	−0	View file
drivers/media/cec/Makefile	modified	+1	−1	View file
drivers/media/cec/core/cec-adap.c	modified	+0	−4	View file
drivers/media/cec/core/cec-api.c	modified	+7	−1	View file
drivers/media/cec/core/cec-core.c	modified	+0	−1	View file
drivers/media/cec/core/cec-notifier.c	modified	+7	−4	View file
drivers/media/cec/i2c/Kconfig	added	+14	−0	View file
drivers/media/cec/i2c/Makefile	added	+5	−0	View file
drivers/media/cec/i2c/ch7322.c	added	+604	−0	View file
drivers/media/cec/platform/cros-ec/cros-ec-cec.c	modified	+1	−5	View file
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c	modified	+33	−7	View file
drivers/media/common/videobuf2/videobuf2-core.c	modified	+225	−142	View file
drivers/media/common/videobuf2/videobuf2-dma-contig.c	modified	+38	−6	View file
drivers/media/common/videobuf2/videobuf2-dma-sg.c	modified	+30	−8	View file
drivers/media/common/videobuf2/videobuf2-v4l2.c	modified	+114	−33	View file
drivers/media/dvb-core/dvb_vb2.c	modified	+1	−1	View file
drivers/media/dvb-frontends/drxk_hard.c	modified	+0	−11	View file
drivers/media/dvb-frontends/rtl2832_sdr.c	modified	+1	−1	View file
drivers/media/firewire/firedtv-fw.c	modified	+2	−0	View file
drivers/media/i2c/Kconfig	modified	+39	−0	View file
drivers/media/i2c/Makefile	modified	+4	−0	View file
drivers/media/i2c/dw9768.c	added	+554	−0	View file
drivers/media/i2c/imx290.c	modified	+343	−61	View file
drivers/media/i2c/max9271.c	added	+341	−0	View file
drivers/media/i2c/max9271.h	added	+224	−0	View file
drivers/media/i2c/max9286.c	added	+1320	−0	View file
drivers/media/i2c/ov2740.c	modified	+146	−3	View file
drivers/media/i2c/ov9640.c	modified	+1	−1	View file
drivers/media/i2c/rdacm20.c	added	+667	−0	View file
drivers/media/i2c/s5k6a3.c	modified	+1	−1	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+2	−3	View file
drivers/media/i2c/tvp5150.c	modified	+6	−2	View file
drivers/media/mc/mc-request.c	modified	+17	−14	View file
drivers/media/pci/cx18/cx18-cards.c	modified	+1	−1	View file
drivers/media/pci/cx23885/cx23885-core.c	modified	+0	−3	View file
drivers/media/pci/cx23885/cx23888-ir.c	modified	+0	−20	View file
drivers/media/pci/cx25821/cx25821-core.c	modified	+0	−3	View file
drivers/media/pci/cx88/cx88-video.c	modified	+16	−44	View file
drivers/media/pci/dt3155/dt3155.c	modified	+1	−1	View file
drivers/media/pci/dt3155/dt3155.h	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-cards.c	modified	+1	−1	View file
drivers/media/pci/meye/meye.c	modified	+5	−10	View file
drivers/media/pci/meye/meye.h	modified	+0	−2	View file
drivers/media/pci/saa7164/saa7164-core.c	modified	+0	−3	View file
drivers/media/pci/solo6x10/solo6x10-core.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-disp.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-eeprom.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-enc.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-g723.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-gpio.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-i2c.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-jpeg.h	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-offsets.h	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-p2m.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-regs.h	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-tw28.c	modified	+1	−1	View file
drivers/media/pci/solo6x10/solo6x10-tw28.h	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/solo6x10/solo6x10.h	modified	+1	−1	View file
drivers/media/pci/sta2x11/sta2x11_vip.c	modified	+15	−48	View file
drivers/media/pci/ttpci/av7110.c	modified	+3	−2	View file
drivers/media/pci/ttpci/budget-core.c	modified	+8	−3	View file
drivers/media/pci/tw5864/tw5864-core.c	modified	+1	−1	View file
drivers/media/pci/tw68/tw68-core.c	modified	+12	−20	View file
drivers/media/platform/am437x/am437x-vpfe.c	modified	+3	−16	View file
drivers/media/platform/atmel/atmel-isc-base.c	modified	+24	−36	View file
drivers/media/platform/atmel/atmel-isc-regs.h	modified	+0	−2	View file
drivers/media/platform/atmel/atmel-isc.h	modified	+1	−1	View file
drivers/media/platform/atmel/atmel-sama5d2-isc.c	modified	+2	−0	View file
drivers/media/platform/coda/coda-common.c	modified	+2	−3	View file
drivers/media/platform/coda/coda-jpeg.c	modified	+4	−1	View file
drivers/media/platform/davinci/vpbe_display.c	modified	+1	−1	View file
drivers/media/platform/davinci/vpif.c	modified	+2	−1	View file
drivers/media/platform/davinci/vpif.h	modified	+1	−1	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+0	−2	View file
drivers/media/platform/davinci/vpif_display.c	modified	+1	−1	View file
drivers/media/platform/davinci/vpif_display.h	modified	+1	−1	View file
drivers/media/platform/davinci/vpss.c	modified	+16	−4	View file
drivers/media/platform/exynos-gsc/gsc-core.c	modified	+1	−1	View file
drivers/media/platform/exynos-gsc/gsc-m2m.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-capture.c	modified	+6	−16	View file
drivers/media/platform/exynos4-is/fimc-is.c	modified	+1	−0	View file
drivers/media/platform/exynos4-is/fimc-isp-video.c	modified	+1	−0	View file
drivers/media/platform/exynos4-is/fimc-lite.c	modified	+3	−15	View file
drivers/media/platform/exynos4-is/media-dev.c	modified	+4	−1	View file
drivers/media/platform/marvell-ccic/cafe-driver.c	modified	+7	−24	View file
drivers/media/platform/marvell-ccic/mcam-core.c	modified	+2	−3	View file
drivers/media/platform/marvell-ccic/mcam-core.h	modified	+0	−2	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	+19	−57	View file
drivers/media/platform/mtk-mdp/mtk_mdp_comp.h	modified	+4	−19	View file
drivers/media/platform/mtk-mdp/mtk_mdp_core.c	modified	+44	−25	View file
drivers/media/platform/mtk-mdp/mtk_mdp_core.h	modified	+8	−4	View file
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c	modified	+37	−60	View file
drivers/media/platform/omap3isp/isppreview.c	modified	+3	−1	View file
drivers/media/platform/pxa_camera.c	modified	+9	−12	View file
drivers/media/platform/qcom/camss/camss-csid.c	modified	+4	−2	View file
drivers/media/platform/qcom/camss/camss-csiphy.c	modified	+1	−1	View file
drivers/media/platform/qcom/camss/camss-ispif.c	modified	+4	−2	View file
drivers/media/platform/qcom/camss/camss-vfe.c	modified	+4	−6	View file
drivers/media/platform/qcom/camss/camss.c	modified	+20	−10	View file
drivers/media/platform/qcom/venus/pm_helpers.c	modified	+4	−0	View file
drivers/media/platform/qcom/venus/venc.c	modified	+1	−2	View file
drivers/media/platform/rcar-vin/rcar-csi2.c	modified	+8	−7	View file
drivers/media/platform/rcar-vin/rcar-dma.c	modified	+19	−2	View file
drivers/media/platform/rcar-vin/rcar-v4l2.c	modified	+12	−3	View file
drivers/media/platform/rcar_jpu.c	modified	+1	−1	View file
drivers/media/platform/rockchip/rga/rga-hw.c	modified	+16	−13	View file
drivers/media/platform/rockchip/rga/rga-hw.h	modified	+5	−0	View file
drivers/media/platform/s3c-camif/camif-core.c	modified	+1	−1	View file
drivers/media/platform/s5p-g2d/g2d.c	modified	+15	−13	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+2	−14	View file
drivers/media/platform/sti/hva/hva-v4l2.c	modified	+1	−1	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c	modified	+2	−0	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c	modified	+1	−1	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c	modified	+2	−3	View file
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c	modified	+2	−0	View file
drivers/media/platform/ti-vpe/Makefile	modified	+1	−1	View file
drivers/media/platform/ti-vpe/cal-camerarx.c	added	+649	−0	View file
drivers/media/platform/ti-vpe/cal-video.c	added	+886	−0	View file
drivers/media/platform/ti-vpe/cal.c	modified	+489	−2034	View file
drivers/media/platform/ti-vpe/cal.h	added	+267	−0	View file
drivers/media/platform/ti-vpe/cal_regs.h	modified	+36	−38	View file
drivers/media/platform/ti-vpe/vpe.c	modified	+1	−1	View file
drivers/media/platform/vsp1/vsp1_dl.c	modified	+2	−0	View file
drivers/media/platform/xilinx/Kconfig	modified	+7	−0	View file
drivers/media/platform/xilinx/Makefile	modified	+1	−0	View file
drivers/media/platform/xilinx/xilinx-csi2rxss.c	added	+1111	−0	View file
drivers/media/radio/si4713/radio-usb-si4713.c	modified	+1	−1	View file
drivers/media/rc/Kconfig	modified	+11	−0	View file
drivers/media/rc/Makefile	modified	+1	−0	View file
drivers/media/rc/fintek-cir.c	modified	+0	−7	View file
drivers/media/rc/imon.c	modified	+1	−1	View file
drivers/media/rc/ir_toy.c	added	+509	−0	View file
drivers/media/rc/nuvoton-cir.c	modified	+0	−32	View file
drivers/media/rc/rc-main.c	modified	+1	−1	View file
drivers/media/test-drivers/vicodec/vicodec-core.c	modified	+3	−3	View file
drivers/media/test-drivers/vimc/Kconfig	modified	+2	−0	View file
drivers/media/test-drivers/vimc/vimc-common.h	modified	+1	−0	View file
drivers/media/test-drivers/vimc/vimc-core.c	modified	+10	−0	View file
drivers/media/test-drivers/vimc/vimc-sensor.c	modified	+71	−0	View file
drivers/media/test-drivers/vivid/vivid-core.c	modified	+11	−2	View file
drivers/media/usb/cx231xx/cx231xx-417.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/dvbsky.c	modified	+4	−4	View file
drivers/media/usb/dvb-usb/Kconfig	modified	+1	−0	View file
drivers/media/usb/go7007/go7007-usb.c	modified	+10	−1	View file
drivers/media/usb/gspca/gspca.c	modified	+1	−1	View file
drivers/media/usb/gspca/jl2005bcd.c	modified	+1	−1	View file
drivers/media/usb/gspca/ov534.c	modified	+1	−1	View file
drivers/media/usb/gspca/sn9c2028.c	modified	+1	−1	View file
drivers/media/v4l2-core/v4l2-async.c	modified	+75	−8	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+8	−2	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+11	−8	View file
drivers/media/v4l2-core/v4l2-mem2mem.c	modified	+3	−3	View file
drivers/staging/media/Kconfig	modified	+0	−2	View file
drivers/staging/media/Makefile	modified	+0	−1	View file
drivers/staging/media/allegro-dvt/allegro-core.c	modified	+228	−163	View file
drivers/staging/media/allegro-dvt/allegro-mail.c	modified	+506	−0	View file
drivers/staging/media/allegro-dvt/allegro-mail.h	modified	+69	−42	View file
drivers/staging/media/hantro/hantro.h	modified	+3	−10	View file
drivers/staging/media/hantro/hantro_drv.c	modified	+43	−51	View file
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c	modified	+17	−0	View file
drivers/staging/media/hantro/hantro_h264.c	modified	+2	−4	View file
drivers/staging/media/hantro/hantro_hw.h	modified	+3	−2	View file
drivers/staging/media/hantro/hantro_v4l2.c	modified	+15	−15	View file
drivers/staging/media/hantro/imx8m_vpu_hw.c	modified	+1	−1	View file
drivers/staging/media/hantro/rk3288_vpu_hw.c	modified	+4	−4	View file
drivers/staging/media/hantro/rk3399_vpu_hw.c	modified	+3	−4	View file
drivers/staging/media/imx/imx-ic-prp.c	modified	+2	−2	View file
drivers/staging/media/imx/imx-ic-prpencvf.c	modified	+2	−2	View file
drivers/staging/media/imx/imx-media-csi.c	modified	+2	−2	View file
drivers/staging/media/imx/imx-media-vdic.c	modified	+2	−2	View file
drivers/staging/media/rkisp1/TODO	modified	+0	−1	View file
drivers/staging/media/rkisp1/rkisp1-capture.c	modified	+20	−36	View file
drivers/staging/media/rkisp1/rkisp1-common.h	modified	+15	−11	View file
drivers/staging/media/rkisp1/rkisp1-dev.c	modified	+8	−3	View file
drivers/staging/media/rkisp1/rkisp1-isp.c	modified	+38	−37	View file
drivers/staging/media/rkisp1/rkisp1-params.c	modified	+1	−1	View file
drivers/staging/media/rkisp1/rkisp1-regs.h	modified	+0	−1	View file
drivers/staging/media/rkisp1/rkisp1-resizer.c	modified	+9	−9	View file
drivers/staging/media/rkisp1/rkisp1-stats.c	modified	+17	−109	View file
drivers/staging/media/rkisp1/uapi/rkisp1-config.h	modified	+2	−2	View file
drivers/staging/media/rkvdec/rkvdec.c	modified	+28	−1	View file
drivers/staging/media/soc_camera/Kconfig	deleted	+0	−51	View before deletion
drivers/staging/media/soc_camera/Makefile	deleted	+0	−7	View before deletion
drivers/staging/media/soc_camera/TODO	deleted	+0	−4	View before deletion
drivers/staging/media/soc_camera/imx074.c	deleted	+0	−492	View before deletion
drivers/staging/media/soc_camera/mt9t031.c	deleted	+0	−853	View before deletion
drivers/staging/media/soc_camera/soc-camera.rst	deleted	+0	−171	View before deletion
drivers/staging/media/soc_camera/soc_camera.c	deleted	+0	−2164	View before deletion
drivers/staging/media/soc_camera/soc_mediabus.c	deleted	+0	−529	View before deletion
drivers/staging/media/soc_camera/soc_mt9v022.c	deleted	+0	−1008	View before deletion
drivers/staging/media/soc_camera/soc_ov5642.c	deleted	+0	−1085	View before deletion
drivers/staging/media/soc_camera/soc_ov9740.c	deleted	+0	−992	View before deletion
drivers/staging/media/tegra-vde/vde.c	modified	+27	−18	View file
drivers/usb/class/cdc-acm.c	modified	+6	−0	View file
include/linux/platform_data/media/omap1_camera.h	deleted	+0	−32	View before deletion
include/linux/property.h	modified	+5	−0	View file
include/media/cec.h	modified	+55	−2	View file
include/media/davinci/vpbe_display.h	modified	+1	−1	View file
include/media/drv-intf/soc_mediabus.h	deleted	+0	−107	View before deletion
include/media/dvbdev.h	modified	+3	−3	View file
include/media/media-device.h	modified	+1	−1	View file
include/media/media-devnode.h	modified	+1	−1	View file
include/media/media-entity.h	modified	+1	−1	View file
include/media/soc_camera.h	deleted	+0	−397	View before deletion
include/media/tpg/v4l2-tpg.h	modified	+2	−1	View file
include/media/v4l2-mc.h	modified	+4	−4	View file
include/media/v4l2-rect.h	modified	+20	−0	View file
include/media/v4l2-subdev.h	modified	+20	−19	View file
include/media/videobuf2-core.h	modified	+40	−11	View file
include/media/videobuf2-v4l2.h	modified	+13	−0	View file
include/uapi/linux/videodev2.h	modified	+15	−2	View file

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

Documentation/admin-guide/media/fimc.rst

View file

diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin-guide/media/fimc.rst
index 0b8ddc4..56b149d 100644
--- a/Documentation/admin-guide/media/fimc.rst
+++ b/Documentation/admin-guide/media/fimc.rst
@@ -2,7 +2,7 @@
 
 .. include:: <isonum.txt>
 
-The Samsung S5P/EXYNOS4 FIMC driver
+The Samsung S5P/Exynos4 FIMC driver
 ===================================
 
 Copyright |copy| 2012 - 2013 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@ drivers/media/platform/exynos4-is directory.
 Supported SoCs
 --------------
 
-S5PC100 (mem-to-mem only), S5PV210, EXYNOS4210
+S5PC100 (mem-to-mem only), S5PV210, Exynos4210
 
 Supported features
 ------------------
@@ -45,7 +45,7 @@ Media device interface
 ~~~~~~~~~~~~~~~~~~~~~~
 
 The driver supports Media Controller API as defined at :ref:`media_controller`.
-The media device driver name is "SAMSUNG S5P FIMC".
+The media device driver name is "Samsung S5P FIMC".
 
 The purpose of this interface is to allow changing assignment of FIMC instances
 to the SoC peripheral camera input at runtime and optionally to control internal

Documentation/admin-guide/media/vivid.rst

View file

diff --git a/Documentation/admin-guide/media/vivid.rst b/Documentation/admin-guide/media/vivid.rst
index 52e57b7..6d7175f 100644
--- a/Documentation/admin-guide/media/vivid.rst
+++ b/Documentation/admin-guide/media/vivid.rst
@@ -293,6 +293,15 @@ all configurable using the following module options:
 		- 0: vmalloc
 		- 1: dma-contig
 
+- cache_hints:
+
+	specifies if the device should set queues' user-space cache and memory
+	consistency hint capability (V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS).
+	The hints are valid only when using MMAP streaming I/O. Default is 0.
+
+		- 0: forbid hints
+		- 1: allow hints
+
 Taken together, all these module options allow you to precisely customize
 the driver behavior and test your application with all sorts of permutations.
 It is also very suitable to emulate hardware that is not yet available, e.g.

Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml b/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
new file mode 100644
index 0000000..daa2869
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/i2c/chrontel,ch7322.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Chrontel HDMI-CEC Controller
+
+maintainers:
+  - Jeff Chase <[email protected]>
+
+description:
+  The Chrontel CH7322 is a discrete HDMI-CEC controller. It is
+  programmable through I2C and drives a single CEC line.
+
+properties:
+  compatible:
+    const: chrontel,ch7322
+
+  reg:
+    description: I2C device address
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  reset-gpios:
+    description:
+      Reference to the GPIO connected to the RESET pin, if any. This
+      pin is active-low.
+    maxItems: 1
+
+  standby-gpios:
+    description:
+      Reference to the GPIO connected to the OE pin, if any. When low
+      the device will respond to power status requests with "standby"
+      if in auto mode.
+    maxItems: 1
+
+  # see ../cec.txt
+  hdmi-phandle:
+    description: phandle to the HDMI controller
+
+required:
+  - compatible
+  - reg
+  - interrupts
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      ch7322@75 {
+        compatible = "chrontel,ch7322";
+        reg = <0x75>;
+        interrupts = <47 IRQ_TYPE_EDGE_RISING>;
+        standby-gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+        reset-gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+        hdmi-phandle = <&hdmi>;
+      };
+    };

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml b/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
new file mode 100644
index 0000000..cb96e95
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
@@ -0,0 +1,100 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+# Copyright (c) 2020 MediaTek Inc.
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/dongwoon,dw9768.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Dongwoon Anatech DW9768 Voice Coil Motor (VCM) Lens Device Tree Bindings
+
+maintainers:
+  - Dongchun Zhu <[email protected]>
+
+description: |-
+  The Dongwoon DW9768 is a single 10-bit digital-to-analog (DAC) converter
+  with 100 mA output current sink capability. VCM current is controlled with
+  a linear mode driver. The DAC is controlled via a 2-wire (I2C-compatible)
+  serial interface that operates at clock rates up to 1MHz. This chip
+  integrates Advanced Actuator Control (AAC) technology and is intended for
+  driving voice coil lenses in camera modules.
+
+properties:
+  compatible:
+    enum:
+      - dongwoon,dw9768 # for DW9768 VCM
+      - giantec,gt9769  # for GT9769 VCM
+
+  reg:
+    maxItems: 1
+
+  vin-supply:
+    description:
+      Definition of the regulator used as Digital I/O voltage supply.
+
+  vdd-supply:
+    description:
+      Definition of the regulator used as Digital core voltage supply.
+
+  dongwoon,aac-mode:
+    description:
+      Indication of AAC mode select.
+    allOf:
+      - $ref: "/schemas/types.yaml#/definitions/uint32"
+      - enum:
+          - 1    #  AAC2 mode(operation time# 0.48 x Tvib)
+          - 2    #  AAC3 mode(operation time# 0.70 x Tvib)
+          - 3    #  AAC4 mode(operation time# 0.75 x Tvib)
+          - 5    #  AAC8 mode(operation time# 1.13 x Tvib)
+        default: 2
+
+  dongwoon,aac-timing:
+    description:
+      Number of AAC Timing count that controlled by one 6-bit period of
+      vibration register AACT[5:0], the unit of which is 100 us.
+    allOf:
+      - $ref: "/schemas/types.yaml#/definitions/uint32"
+      - default: 0x20
+        minimum: 0x00
+        maximum: 0x3f
+
+  dongwoon,clock-presc:
+    description:
+      Indication of VCM internal clock dividing rate select, as one multiple
+      factor to calculate VCM ring periodic time Tvib.
+    allOf:
+      - $ref: "/schemas/types.yaml#/definitions/uint32"
+      - enum:
+          - 0    #  Dividing Rate -  2
+          - 1    #  Dividing Rate -  1
+          - 2    #  Dividing Rate -  1/2
+          - 3    #  Dividing Rate -  1/4
+          - 4    #  Dividing Rate -  8
+          - 5    #  Dividing Rate -  4
+        default: 1
+
+required:
+  - compatible
+  - reg
+  - vin-supply
+  - vdd-supply
+
+additionalProperties: false
+
+examples:
+  - |
+
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        dw9768: camera-lens@c {
+            compatible = "dongwoon,dw9768";
+            reg = <0x0c>;
+
+            vin-supply = <&mt6358_vcamio_reg>;
+            vdd-supply = <&mt6358_vcama2_reg>;
+            dongwoon,aac-timing = <0x39>;
+        };
+    };
+
+...

Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml b/Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
new file mode 100644
index 0000000..5ad4b8c
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
@@ -0,0 +1,159 @@
+# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
+# Copyright (C) 2019 Renesas Electronics Corp.
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/imi,rdacm2x-gmsl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title:  IMI D&D RDACM20 and RDACM21 Automotive Camera Platforms
+
+maintainers:
+  - Jacopo Mondi <[email protected]>
+  - Kieran Bingham <[email protected]>
+  - Laurent Pinchart <[email protected]>
+  - Niklas Söderlund <[email protected]>
+
+description: -|
+  The IMI D&D RDACM20 and RDACM21 are GMSL-compatible camera designed for
+  automotive applications.
+
+  The RDACM20 camera module encloses a Maxim Integrated MAX9271 GMSL serializer,
+  coupled with an OV10635 image sensor and an embedded MCU. Both the MCU and
+  the image sensor are connected to the serializer local I2C bus and are
+  accessible by the host SoC by direct addressing.
+
+  The RDACM21 camera module encloses the same serializer, coupled with an
+  OV10640 image sensor and an OV490 ISP. Only the OV490 ISP is interfaced to
+  the serializer local I2C bus while the image sensor is not accessible from
+  the host SoC.
+
+  They both connect to a remote GMSL endpoint through a coaxial cable.
+
+                                                   IMI RDACM20
+  +---------------+                        +--------------------------------+
+  |      GMSL     |   <- Video Stream      |       <- Video--------\        |
+  |               |< === GMSL Link ====== >|MAX9271<- I2C bus-> <-->OV10635 |
+  | de-serializer |   <- I2C messages ->   |                   \<-->MCU     |
+  +---------------+                        +--------------------------------+
+
+                                                   IMI RDACM21
+  +---------------+                        +--------------------------------+
+  |      GMSL     |   <- Video Stream      |       <- Video--------\        |
+  |               |< === GMSL Link ====== >|MAX9271<- I2C bus-> <-->OV490   |
+  |               |   <- I2C messages ->   |                          |     |
+  | de-serializer |                        |          OV10640 <-------|     |
+  +---------------+                        +--------------------------------+
+
+  Both camera modules serialize video data generated by the embedded camera
+  sensor on the GMSL serial channel to a remote GMSL de-serializer. They also
+  receive and transmit I2C messages encapsulated and transmitted on the GMSL
+  bidirectional control channel.
+
+  All I2C traffic received on the GMSL link not directed to the serializer is
+  propagated on the local I2C bus to the remote device there connected. All the
+  I2C traffic generated on the local I2C bus not directed to the serializer is
+  propagated to the remote de-serializer encapsulated in the GMSL control
+  channel.
+
+  The RDACM20 and RDACM21 DT node should be a direct child of the GMSL
+  deserializer's I2C bus corresponding to the GMSL link that the camera is
+  attached to.
+
+properties:
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
+  compatible:
+    enum:
+      - imi,rdacm20
+      - imi,rdacm21
+
+  reg:
+    description: -|
+      I2C device addresses, the first to be assigned to the serializer, the
+      following ones to be assigned to the remote devices.
+
+      For RDACM20 the second entry of the property is assigned to the
+      OV10635 image sensor and the optional third one to the embedded MCU.
+
+      For RDACM21 the second entry is assigned to the OV490 ISP and the optional
+      third one ignored.
+
+    minItems: 2
+    maxItems: 3
+
+  port:
+    type: object
+    additionalProperties: false
+    description: -|
+      Connection to the remote GMSL endpoint are modelled using the OF graph
+      bindings in accordance with the video interface bindings defined in
+      Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+      The device node contains a single "port" child node with a single
+      "endpoint" sub-device.
+
+    properties:
+      endpoint:
+        type: object
+        additionalProperties: false
+
+        properties:
+          remote-endpoint:
+            description: -|
+              phandle to the remote GMSL endpoint sub-node in the remote node
+              port.
+            maxItems: 1
+
+        required:
+          - remote-endpoint
+
+    required:
+      - endpoint
+
+required:
+  - compatible
+  - reg
+  - port
+
+examples:
+  - |
+    i2c@e66d8000 {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      reg = <0 0xe66d8000>;
+
+      camera@31 {
+        compatible = "imi,rdacm20";
+        reg = <0x31>, <0x41>, <0x51>;
+
+        port {
+          rdacm20_out0: endpoint {
+            remote-endpoint = <&max9286_in0>;
+          };
+        };
+      };
+    };
+
+  - |
+    i2c@e66d8000 {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      reg = <0 0xe66d8000>;
+
+      camera@31 {
+        compatible = "imi,rdacm21";
+        reg = <0x31>, <0x41>;
+
+        port {
+          rdacm21_out0: endpoint {
+            remote-endpoint = <&max9286_in0>;
+          };
+        };
+      };
+    };

Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml b/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
new file mode 100644
index 0000000..e7b5431
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
@@ -0,0 +1,366 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (C) 2019 Renesas Electronics Corp.
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/maxim,max9286.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Maxim Integrated Quad GMSL Deserializer
+
+maintainers:
+  - Jacopo Mondi <[email protected]>
+  - Kieran Bingham <[email protected]>
+  - Laurent Pinchart <[email protected]>
+  - Niklas Söderlund <[email protected]>
+
+description: |
+  The MAX9286 deserializer receives video data on up to 4 Gigabit Multimedia
+  Serial Links (GMSL) and outputs them on a CSI-2 D-PHY port using up to 4 data
+  lanes.
+
+  In addition to video data, the GMSL links carry a bidirectional control
+  channel that encapsulates I2C messages. The MAX9286 forwards all I2C traffic
+  not addressed to itself to the other side of the links, where a GMSL
+  serializer will output it on a local I2C bus. In the other direction all I2C
+  traffic received over GMSL by the MAX9286 is output on the local I2C bus.
+
+properties:
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
+  compatible:
+    const: maxim,max9286
+
+  reg:
+    description: I2C device address
+    maxItems: 1
+
+  poc-supply:
+    description: Regulator providing Power over Coax to the cameras
+    maxItems: 1
+
+  enable-gpios:
+    description: GPIO connected to the \#PWDN pin with inverted polarity
+    maxItems: 1
+
+  gpio-controller: true
+
+  '#gpio-cells':
+      const: 2
+
+  ports:
+    type: object
+    description: |
+      The connections to the MAX9286 GMSL and its endpoint nodes are modelled
+      using the OF graph bindings in accordance with the video interface
+      bindings defined in
+      Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+      The following table lists the port number corresponding to each device
+      port.
+
+        Port            Description
+        ----------------------------------------
+        Port 0          GMSL Input 0
+        Port 1          GMSL Input 1
+        Port 2          GMSL Input 2
+        Port 3          GMSL Input 3
+        Port 4          CSI-2 Output
+
+    properties:
+      '#address-cells':
+        const: 1
+
+      '#size-cells':
+        const: 0
+
+      port@[0-3]:
+        type: object
+        properties:
+          reg:
+            enum: [ 0, 1, 2, 3 ]
+
+          endpoint:
+            type: object
+
+            properties:
+              remote-endpoint:
+                description: |
+                 phandle to the remote GMSL source endpoint subnode in the
+                 remote node port.
+
+            required:
+              - remote-endpoint
+
+        required:
+          - reg
+          - endpoint
+
+        additionalProperties: false
+
+      port@4:
+        type: object
+        properties:
+          reg:
+            const: 4
+
+          endpoint:
+            type: object
+
+            properties:
+              remote-endpoint:
+                description: phandle to the remote CSI-2 sink endpoint.
+
+              data-lanes:
+                description: array of physical CSI-2 data lane indexes.
+
+            required:
+              - remote-endpoint
+              - data-lanes
+
+        required:
+          - reg
+          - endpoint
+
+        additionalProperties: false
+
+    required:
+      - port@4
+
+  i2c-mux:
+    type: object
+    description: |
+      Each GMSL link is modelled as a child bus of an i2c bus
+      multiplexer/switch, in accordance with bindings described in
+      Documentation/devicetree/bindings/i2c/i2c-mux.txt.
+
+    properties:
+      '#address-cells':
+        const: 1
+
+      '#size-cells':
+        const: 0
+
+    patternProperties:
+      "^i2c@[0-3]$":
+        type: object
+        description: |
+          Child node of the i2c bus multiplexer which represents a GMSL link.
+          Each serializer device on the GMSL link remote end is represented with
+          an i2c-mux child node. The MAX9286 chip supports up to 4 GMSL
+          channels.
+
+        properties:
+          '#address-cells':
+            const: 1
+
+          '#size-cells':
+            const: 0
+
+          reg:
+            description: The index of the GMSL channel.
+            maxItems: 1
+
+        patternProperties:
+          "^camera@[a-f0-9]+$":
+            type: object
+            description: |
+              The remote camera device, composed by a GMSL serializer and a
+              connected video source.
+
+            properties:
+              compatible:
+                description: The remote device compatible string.
+
+              reg:
+                minItems: 2
+                maxItems: 3
+                description: |
+                  The I2C addresses to be assigned to the remote devices through
+                  address reprogramming. The number of entries depends on the
+                  requirements of the currently connected remote device.
+
+              port:
+                type: object
+
+                properties:
+                  endpoint:
+                    type: object
+
+                    properties:
+                      remote-endpoint:
+                        description: phandle to the MAX9286 sink endpoint.
+
+                    required:
+                      - remote-endpoint
+