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

fab0fca1 · Linus Torvalds <[email protected]> · 2020-12-14 11:47:37 -08:00

Pull media updates from Mauro Carvalho Chehab:

 - some rework at the uAPI pixel format docs

 - the smiapp driver has started to gain support for MIPI CSS camera
   sensors and was renamed

 - two new sensor drivers: ov02a10 and ov9734

 - Meson gained a driver for the 2D acceleration unit

 - Rockchip rkisp1 driver was promoted from staging

 - Cedrus driver gained support for VP8

 - two new remote controller keymaps were added

 - the usual set of fixes cleanups and driver improvements

* tag 'media/v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (447 commits)
  media: ccs: Add support for obtaining C-PHY configuration from firmware
  media: ccs-pll: Print pixel rates
  media: ccs: Print written register values
  media: ccs: Add support for DDR OP SYS and OP PIX clocks
  media: ccs-pll: Add support for DDR OP system and pixel clocks
  media: ccs: Dual PLL support
  media: ccs-pll: Add trivial dual PLL support
  media: ccs-pll: Separate VT divisor limit calculation from the rest
  media: ccs-pll: Fix VT post-PLL divisor calculation
  media: ccs-pll: Make VT divisors 16-bit
  media: ccs-pll: Rework bounds checks
  media: ccs-pll: Print relevant information on PLL tree
  media: ccs-pll: Better separate OP and VT sub-tree calculation
  media: ccs-pll: Check for derating and overrating, support non-derating sensors
  media: ccs-pll: Split off VT subtree calculation
  media: ccs-pll: Add C-PHY support
  media: ccs-pll: Add sanity checks
  media: ccs-pll: Add support flexible OP PLL pixel clock divider
  media: ccs-pll: Support two cycles per pixel on OP domain
  media: ccs-pll: Add support for extended input PLL clock divider
  ...

Commit: fab0fca1da5cdc48be051715cd9787df04fdce3a
Parents: ae1985b5 · 7ea4d232

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

Changes

407 files changed · +23936 −13919

File	Status	Add	Del	Content
Documentation/admin-guide/media/rkisp1.rst	modified	+2	−2	View file
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml	modified	+2	−0	View file
Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml	added	+47	−0	View file
Documentation/devicetree/bindings/media/coda.txt	deleted	+0	−31	View before deletion
Documentation/devicetree/bindings/media/coda.yaml	added	+108	−0	View file
Documentation/devicetree/bindings/media/i2c/adv7604.txt	deleted	+0	−88	View before deletion
Documentation/devicetree/bindings/media/i2c/adv7604.yaml	added	+178	−0	View file
Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt	deleted	+0	−46	View before deletion
Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml	added	+75	−0	View file
Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml	added	+135	−0	View file
Documentation/devicetree/bindings/media/i2c/nokia,smia.txt	deleted	+0	−66	View before deletion
Documentation/devicetree/bindings/media/i2c/ov2680.txt	deleted	+0	−46	View before deletion
Documentation/devicetree/bindings/media/i2c/ov772x.txt	deleted	+0	−40	View before deletion
Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml	added	+159	−0	View file
Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml	added	+99	−0	View file
Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml	added	+134	−0	View file
Documentation/devicetree/bindings/media/i2c/sony,imx214.txt	deleted	+0	−53	View before deletion
Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml	added	+133	−0	View file
Documentation/devicetree/bindings/media/imx7-csi.txt	deleted	+0	−42	View before deletion
Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt	deleted	+0	−90	View before deletion
Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml	added	+71	−0	View file
Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml	added	+173	−0	View file
Documentation/devicetree/bindings/media/qcom,camss.txt	modified	+7	−0	View file
Documentation/devicetree/bindings/media/rc.yaml	modified	+2	−0	View file
drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml → Documentation/devicetree/bindings/media/rockchip-isp1.yaml	renamed	+52	−29	View file
Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml	modified	+38	−0	View file
Documentation/driver-api/media/camera-sensor.rst	modified	+13	−0	View file
Documentation/driver-api/media/cec-core.rst	modified	+2	−2	View file
Documentation/driver-api/media/csi2.rst	modified	+3	−4	View file
Documentation/driver-api/media/drivers/ccs/ccs-regs.asc	added	+1041	−0	View file
Documentation/driver-api/media/drivers/ccs/ccs.rst	added	+82	−0	View file
Documentation/driver-api/media/drivers/ccs/mk-ccs-regs	added	+433	−0	View file
Documentation/driver-api/media/drivers/index.rst	modified	+1	−0	View file
Documentation/driver-api/media/dtv-frontend.rst	modified	+3	−3	View file
Documentation/driver-api/media/v4l2-controls.rst	modified	+2	−2	View file
Documentation/driver-api/media/v4l2-dev.rst	modified	+1	−1	View file
Documentation/userspace-api/media/cec/cec-ioc-g-mode.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/audio.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/ca.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/demux.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/dmx-qbuf.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/net.rst	modified	+1	−1	View file
Documentation/userspace-api/media/dvb/video.rst	modified	+1	−1	View file
Documentation/userspace-api/media/lirc.h.rst.exceptions	modified	+1	−0	View file
Documentation/userspace-api/media/rc/keytable.c.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-dev-intro.rst	modified	+10	−3	View file
Documentation/userspace-api/media/rc/lirc-dev.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-func.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-get-features.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-get-rec-mode.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-get-rec-resolution.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-get-send-mode.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-get-timeout.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-header.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-read.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-measure-carrier-mode.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-rec-carrier-range.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-rec-carrier.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-rec-timeout-reports.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-rec-timeout.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-send-carrier.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-send-duty-cycle.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-transmitter-mask.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-set-wideband-receiver.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/lirc-write.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/rc-intro.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/rc-protos.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/rc-sysfs-nodes.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/rc-table-change.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/rc-tables.rst	modified	+1	−1	View file
Documentation/userspace-api/media/rc/remote_controllers.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/biblio.rst	modified	+11	−1	View file
Documentation/userspace-api/media/v4l/buffer.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/colorspaces-details.rst	modified	+3	−2	View file
Documentation/userspace-api/media/v4l/common.rst	modified	+1	−0	View file
Documentation/userspace-api/media/v4l/dev-mem2mem.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst	added	+793	−0	View file
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst	modified	+2	−815	View file
Documentation/userspace-api/media/v4l/ext-ctrls-image-source.rst	modified	+14	−0	View file
Documentation/userspace-api/media/v4l/extended-controls.rst	modified	+4	−4	View file
Documentation/userspace-api/media/v4l/pixfmt-compressed.rst	modified	+17	−20	View file
Documentation/userspace-api/media/v4l/pixfmt-grey.rst	deleted	+0	−44	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-m420.rst	modified	+2	−57	View file
Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst	modified	+4	−3	View file
Documentation/userspace-api/media/v4l/pixfmt-nv12.rst	deleted	+0	−129	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-nv12m.rst	deleted	+0	−144	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-nv12mt.rst	deleted	+0	−60	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-nv16.rst	deleted	+0	−153	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-nv16m.rst	deleted	+0	−157	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-nv24.rst	deleted	+0	−95	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst	modified	+199	−213	View file
Documentation/userspace-api/media/v4l/pixfmt-rgb.rst	modified	+185	−486	View file
Documentation/userspace-api/media/v4l/pixfmt-uyvy.rst	deleted	+0	−110	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-vyuy.rst	deleted	+0	−108	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y10.rst	deleted	+0	−65	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y10b.rst	deleted	+0	−33	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y10p.rst	deleted	+0	−43	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y12.rst	deleted	+0	−65	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y14.rst	deleted	+0	−65	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y16-be.rst	deleted	+0	−69	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y16.rst	deleted	+0	−69	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-y41p.rst	deleted	+0	−151	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst	added	+126	−0	View file
Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst	added	+950	−0	View file
Documentation/userspace-api/media/v4l/pixfmt-yuv410.rst	deleted	+0	−127	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv411p.rst	deleted	+0	−115	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv420.rst	deleted	+0	−143	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv420m.rst	deleted	+0	−152	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv422m.rst	deleted	+0	−141	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv422p.rst	deleted	+0	−129	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuv444m.rst	deleted	+0	−141	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yuyv.rst	deleted	+0	−118	View before deletion
Documentation/userspace-api/media/v4l/pixfmt-yvyu.rst	deleted	+0	−108	View before deletion
Documentation/userspace-api/media/v4l/selection-api-configuration.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/subdev-formats.rst	modified	+27	−0	View file
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst	modified	+41	−5	View file
Documentation/userspace-api/media/v4l/vidioc-g-output.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/vidioc-qbuf.rst	modified	+1	−1	View file
Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst	modified	+6	−0	View file
Documentation/userspace-api/media/v4l/yuv-formats.rst	modified	+247	−31	View file
Documentation/userspace-api/media/videodev2.h.rst.exceptions	modified	+2	−0	View file
MAINTAINERS	modified	+58	−29	View file
drivers/media/Kconfig	modified	+0	−1	View file
drivers/media/cec/core/cec-core.c	modified	+2	−2	View file
drivers/media/common/cx2341x.c	modified	+2	−2	View file
drivers/media/common/saa7146/saa7146_core.c	modified	+21	−18	View file
drivers/media/common/saa7146/saa7146_fops.c	modified	+4	−5	View file
drivers/media/common/saa7146/saa7146_vbi.c	modified	+3	−3	View file
drivers/media/common/saa7146/saa7146_video.c	modified	+2	−4	View file
drivers/media/common/siano/smsdvb-main.c	modified	+4	−1	View file
drivers/media/dvb-core/dvbdev.c	modified	+3	−0	View file
drivers/media/dvb-frontends/ascot2e.h	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2820r.h	modified	+1	−1	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+0	−7	View file
drivers/media/dvb-frontends/drxd_hard.c	modified	+0	−1	View file
drivers/media/dvb-frontends/drxk.h	modified	+1	−1	View file
drivers/media/dvb-frontends/dvb-pll.h	modified	+1	−1	View file
drivers/media/dvb-frontends/helene.h	modified	+2	−2	View file
drivers/media/dvb-frontends/horus3a.h	modified	+1	−1	View file
drivers/media/dvb-frontends/ix2505v.h	modified	+2	−2	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+3	−3	View file
drivers/media/dvb-frontends/m88ds3103.h	modified	+1	−1	View file
drivers/media/dvb-frontends/mb86a20s.h	modified	+1	−1	View file
drivers/media/dvb-frontends/nxt200x.c	modified	+0	−16	View file
drivers/media/dvb-frontends/rtl2832.c	modified	+7	−7	View file
drivers/media/dvb-frontends/si2165.c	modified	+1	−1	View file
drivers/media/dvb-frontends/si2165.h	modified	+1	−1	View file
drivers/media/dvb-frontends/si21xx.c	modified	+0	−2	View file
drivers/media/dvb-frontends/stb6000.h	modified	+1	−1	View file
drivers/media/dvb-frontends/tda826x.h	modified	+1	−1	View file
drivers/media/dvb-frontends/ts2020.c	modified	+5	−5	View file
drivers/media/dvb-frontends/zl10036.h	modified	+2	−2	View file
drivers/media/i2c/Kconfig	modified	+30	−2	View file
drivers/media/i2c/Makefile	modified	+4	−2	View file
drivers/media/i2c/ad5820.c	modified	+2	−4	View file
drivers/media/i2c/adp1653.c	modified	+2	−4	View file
drivers/media/i2c/adv7180.c	modified	+2	−4	View file
drivers/media/i2c/adv748x/adv748x-afe.c	modified	+1	−5	View file
drivers/media/i2c/adv748x/adv748x-core.c	modified	+29	−5	View file
drivers/media/i2c/adv748x/adv748x-csi2.c	modified	+1	−5	View file
drivers/media/i2c/adv748x/adv748x.h	modified	+2	−0	View file
drivers/media/i2c/ak7375.c	modified	+2	−5	View file
drivers/media/i2c/ccs-pll.c	added	+886	−0	View file
drivers/media/i2c/ccs-pll.h	added	+214	−0	View file
drivers/media/i2c/smiapp/Kconfig → drivers/media/i2c/ccs/Kconfig	renamed	+5	−4	View file
drivers/media/i2c/ccs/Makefile	added	+6	−0	View file
drivers/media/i2c/ccs/ccs-core.c	added	+3479	−0	View file
drivers/media/i2c/ccs/ccs-data-defs.h	added	+221	−0	View file
drivers/media/i2c/ccs/ccs-data.c	added	+953	−0	View file
drivers/media/i2c/ccs/ccs-data.h	added	+228	−0	View file
drivers/media/i2c/ccs/ccs-limits.c	added	+239	−0	View file
drivers/media/i2c/ccs/ccs-limits.h	added	+259	−0	View file
drivers/media/i2c/smiapp/smiapp-quirk.c → drivers/media/i2c/ccs/ccs-quirk.c	renamed	+46	−59	View file
drivers/media/i2c/smiapp/smiapp-quirk.h → drivers/media/i2c/ccs/ccs-quirk.h	renamed	+26	−28	View file
drivers/media/i2c/smiapp/smiapp-regs.c → drivers/media/i2c/ccs/ccs-reg-access.c	renamed	+218	−70	View file
drivers/media/i2c/ccs/ccs-reg-access.h	added	+42	−0	View file
drivers/media/i2c/ccs/ccs-regs.h	added	+954	−0	View file
drivers/media/i2c/ccs/ccs.h	added	+290	−0	View file
drivers/media/i2c/ccs/smiapp-reg-defs.h	added	+580	−0	View file
drivers/media/i2c/dw9768.c	modified	+2	−4	View file
drivers/media/i2c/et8ek8/et8ek8_driver.c	modified	+3	−5	View file
drivers/media/i2c/hi556.c	modified	+2	−4	View file
drivers/media/i2c/imx214.c	modified	+1	−1	View file
drivers/media/i2c/imx219.c	modified	+17	−21	View file
drivers/media/i2c/imx258.c	modified	+1	−1	View file
drivers/media/i2c/imx274.c	modified	+205	−75	View file
drivers/media/i2c/imx290.c	modified	+4	−6	View file
drivers/media/i2c/imx319.c	modified	+3	−5	View file
drivers/media/i2c/imx355.c	modified	+3	−5	View file
drivers/media/i2c/max2175.c	modified	+1	−1	View file
drivers/media/i2c/max9271.c	modified	+4	−4	View file
drivers/media/i2c/msp3400-kthreads.c	modified	+8	−4	View file
drivers/media/i2c/mt9p031.c	modified	+1	−2	View file
drivers/media/i2c/ov02a10.c	added	+1015	−0	View file
drivers/media/i2c/ov13858.c	modified	+2	−4	View file
drivers/media/i2c/ov2680.c	modified	+2	−4	View file
drivers/media/i2c/ov2685.c	modified	+2	−4	View file
drivers/media/i2c/ov2740.c	modified	+135	−79	View file
drivers/media/i2c/ov5640.c	modified	+70	−38	View file
drivers/media/i2c/ov5670.c	modified	+2	−4	View file
drivers/media/i2c/ov5675.c	modified	+2	−4	View file
drivers/media/i2c/ov5695.c	modified	+2	−4	View file
drivers/media/i2c/ov7670.c	modified	+56	−40	View file
drivers/media/i2c/ov772x.c	modified	+70	−1	View file
drivers/media/i2c/ov7740.c	modified	+2	−4	View file
drivers/media/i2c/ov8856.c	modified	+2	−4	View file
drivers/media/i2c/ov9734.c	added	+1020	−0	View file
drivers/media/i2c/rdacm20.c	modified	+11	−2	View file
drivers/media/i2c/smiapp-pll.c	deleted	+0	−482	View before deletion
drivers/media/i2c/smiapp-pll.h	deleted	+0	−99	View before deletion
drivers/media/i2c/smiapp/Makefile	deleted	+0	−6	View before deletion
drivers/media/i2c/smiapp/smiapp-core.c	deleted	+0	−3175	View before deletion
drivers/media/i2c/smiapp/smiapp-limits.c	deleted	+0	−118	View before deletion
drivers/media/i2c/smiapp/smiapp-limits.h	deleted	+0	−114	View before deletion
drivers/media/i2c/smiapp/smiapp-reg-defs.h	deleted	+0	−489	View before deletion
drivers/media/i2c/smiapp/smiapp-reg.h	deleted	+0	−116	View before deletion
drivers/media/i2c/smiapp/smiapp-regs.h	deleted	+0	−36	View before deletion
drivers/media/i2c/smiapp/smiapp.h	deleted	+0	−280	View before deletion
drivers/media/i2c/tvp5150.c	modified	+3	−4	View file
drivers/media/pci/b2c2/flexcop-dma.c	modified	+3	−3	View file
drivers/media/pci/bt8xx/bt878.c	modified	+8	−8	View file
drivers/media/pci/bt8xx/btcx-risc.c	modified	+2	−3	View file
drivers/media/pci/bt8xx/bttv-cards.c	modified	+4	−2	View file
drivers/media/pci/bt8xx/bttv-driver.c	modified	+23	−55	View file
drivers/media/pci/bt8xx/bttv-risc.c	modified	+0	−1	View file
drivers/media/pci/cx23885/cx23885-core.c	modified	+4	−1	View file
drivers/media/pci/cx25821/cx25821-core.c	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-mpeg.c	modified	+1	−2	View file
drivers/media/pci/dm1105/dm1105.c	modified	+6	−8	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.c	modified	+58	−61	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.h	modified	+79	−78	View file
drivers/media/pci/mantis/hopper_vp3028.c	modified	+1	−1	View file
drivers/media/pci/saa7134/saa7134-video.c	modified	+15	−15	View file
drivers/media/pci/saa7146/mxb.c	modified	+10	−9	View file
drivers/media/pci/saa7164/saa7164-core.c	modified	+3	−14	View file
drivers/media/pci/solo6x10/solo6x10-g723.c	modified	+7	−6	View file
drivers/media/pci/solo6x10/solo6x10-p2m.c	modified	+5	−5	View file
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c	modified	+18	−17	View file
drivers/media/pci/ttpci/av7110.c	modified	+8	−5	View file
drivers/media/platform/Kconfig	modified	+32	−1	View file
drivers/media/platform/Makefile	modified	+3	−0	View file
drivers/media/platform/coda/coda-bit.c	modified	+51	−22	View file
drivers/media/platform/coda/coda-common.c	modified	+28	−34	View file
drivers/media/platform/coda/coda.h	modified	+11	−0	View file
drivers/media/platform/davinci/isif.c	modified	+9	−2	View file
drivers/media/platform/exynos4-is/fimc-capture.c	modified	+3	−3	View file
drivers/media/platform/exynos4-is/fimc-core.c	modified	+17	−17	View file
drivers/media/platform/exynos4-is/fimc-core.h	modified	+9	−9	View file
drivers/media/platform/exynos4-is/fimc-is.c	modified	+10	−10	View file
drivers/media/platform/exynos4-is/fimc-is.h	modified	+3	−3	View file
drivers/media/platform/exynos4-is/fimc-lite-reg.c	modified	+2	−2	View file
drivers/media/platform/exynos4-is/fimc-lite.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-lite.h	modified	+2	−2	View file
drivers/media/platform/exynos4-is/fimc-m2m.c	modified	+4	−4	View file
drivers/media/platform/exynos4-is/fimc-reg.c	modified	+9	−9	View file
drivers/media/platform/exynos4-is/fimc-reg.h	modified	+2	−2	View file
drivers/media/platform/fsl-viu.c	modified	+55	−66	View file
drivers/media/platform/marvell-ccic/mmp-driver.c	modified	+2	−4	View file
drivers/media/platform/meson/ge2d/Makefile	added	+3	−0	View file
drivers/media/platform/meson/ge2d/ge2d-regs.h	added	+360	−0	View file
drivers/media/platform/meson/ge2d/ge2d.c	added	+1067	−0	View file
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c	modified	+9	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c	modified	+1	−8	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c	modified	+13	−6	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c	modified	+1	−8	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c	modified	+21	−7	View file
drivers/media/platform/mtk-vpu/mtk_vpu.c	modified	+97	−4	View file
drivers/media/platform/omap3isp/ispccdc.c	modified	+2	−3	View file
drivers/media/platform/pxa_camera.c	modified	+2	−2	View file
drivers/media/platform/qcom/camss/camss-csid.c	modified	+6	−3	View file
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c	modified	+6	−1	View file
drivers/media/platform/qcom/camss/camss-csiphy.c	modified	+21	−4	View file
drivers/media/platform/qcom/camss/camss-csiphy.h	modified	+1	−0	View file
drivers/media/platform/qcom/camss/camss-ispif.c	modified	+65	−35	View file
drivers/media/platform/qcom/camss/camss-ispif.h	modified	+1	−1	View file
drivers/media/platform/qcom/camss/camss-vfe-4-7.c	modified	+123	−8	View file
drivers/media/platform/qcom/camss/camss-vfe.c	modified	+14	−5	View file
drivers/media/platform/qcom/camss/camss-vfe.h	modified	+1	−0	View file
drivers/media/platform/qcom/camss/camss-video.c	modified	+36	−54	View file
drivers/media/platform/qcom/camss/camss.c	modified	+202	−4	View file
drivers/media/platform/qcom/camss/camss.h	modified	+1	−0	View file
drivers/media/platform/qcom/venus/core.c	modified	+34	−7	View file
drivers/media/platform/qcom/venus/core.h	modified	+1	−0	View file
drivers/media/platform/qcom/venus/firmware.c	modified	+13	−4	View file
drivers/media/platform/qcom/venus/hfi.c	modified	+12	−0	View file
drivers/media/platform/qcom/venus/pm_helpers.c	modified	+11	−1	View file
drivers/media/platform/qcom/venus/vdec.c	modified	+27	−5	View file
drivers/media/platform/qcom/venus/venc.c	modified	+1	−1	View file
drivers/media/platform/rcar-vin/rcar-core.c	modified	+145	−76	View file
drivers/media/platform/rcar-vin/rcar-csi2.c	modified	+10	−8	View file
drivers/media/platform/rcar-vin/rcar-dma.c	modified	+99	−72	View file
drivers/media/platform/rcar-vin/rcar-v4l2.c	modified	+6	−6	View file
drivers/media/platform/rcar-vin/rcar-vin.h	modified	+15	−8	View file
drivers/staging/media/rkisp1/Makefile → drivers/media/platform/rockchip/rkisp1/Makefile	renamed	+0	−0	View file
drivers/staging/media/rkisp1/rkisp1-capture.c → drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c	renamed	+128	−124	View file
drivers/staging/media/rkisp1/rkisp1-common.c → drivers/media/platform/rockchip/rkisp1/rkisp1-common.c	renamed	+0	−0	View file
drivers/staging/media/rkisp1/rkisp1-common.h → drivers/media/platform/rockchip/rkisp1/rkisp1-common.h	renamed	+6	−10	View file
drivers/staging/media/rkisp1/rkisp1-dev.c → drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c	renamed	+5	−10	View file
drivers/staging/media/rkisp1/rkisp1-isp.c → drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c	renamed	+4	−5	View file
drivers/staging/media/rkisp1/rkisp1-params.c → drivers/media/platform/rockchip/rkisp1/rkisp1-params.c	renamed	+77	−100	View file
drivers/staging/media/rkisp1/rkisp1-regs.h → drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h	renamed	+2	−2	View file
drivers/staging/media/rkisp1/rkisp1-resizer.c → drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c	renamed	+6	−4	View file
drivers/staging/media/rkisp1/rkisp1-stats.c → drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c	renamed	+0	−21	View file
drivers/media/platform/s3c-camif/camif-core.c	modified	+4	−2	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+2	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	modified	+1	−1	View file
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	modified	+1	−1	View file
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c	modified	+12	−11	View file
drivers/media/platform/stm32/stm32-dcmi.c	modified	+57	−6	View file
drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c	modified	+1	−1	View file
drivers/media/radio/radio-sf16fmr2.c	modified	+1	−1	View file
drivers/media/radio/si4713/si4713.c	modified	+1	−1	View file
drivers/media/rc/keymaps/Makefile	modified	+2	−0	View file
drivers/media/rc/keymaps/rc-khamsin.c	added	+75	−0	View file
drivers/media/rc/keymaps/rc-pine64.c	added	+65	−0	View file
drivers/media/rc/lirc_dev.c	modified	+2	−1	View file
drivers/media/rc/sunxi-cir.c	modified	+42	−8	View file
drivers/media/test-drivers/vicodec/codec-fwht.c	modified	+7	−6	View file
drivers/media/test-drivers/vicodec/codec-fwht.h	modified	+0	−32	View file
drivers/media/test-drivers/vicodec/codec-v4l2-fwht.c	modified	+44	−44	View file
drivers/media/test-drivers/vicodec/vicodec-core.c	modified	+23	−23	View file
drivers/media/test-drivers/vim2m.c	modified	+11	−9	View file
drivers/media/test-drivers/vivid/vivid-core.c	modified	+44	−22	View file
drivers/media/test-drivers/vivid/vivid-core.h	modified	+1	−0	View file
drivers/media/test-drivers/vivid/vivid-ctrls.c	modified	+21	−8	View file
drivers/media/test-drivers/vivid/vivid-kthread-cap.c	modified	+4	−2	View file
drivers/media/test-drivers/vivid/vivid-kthread-out.c	modified	+4	−2	View file
drivers/media/test-drivers/vivid/vivid-kthread-touch.c	modified	+4	−2	View file
drivers/media/test-drivers/vivid/vivid-sdr-cap.c	modified	+4	−2	View file
drivers/media/test-drivers/vivid/vivid-vid-cap.c	modified	+7	−11	View file
drivers/media/test-drivers/vivid/vivid-vid-out.c	modified	+7	−11	View file
drivers/media/tuners/mt2060.c	modified	+1	−1	View file
drivers/media/tuners/mt2063.c	modified	+0	−1	View file
drivers/media/tuners/mxl5005s.c	modified	+17	−3	View file
drivers/media/usb/au0828/au0828-video.c	modified	+3	−4	View file
drivers/media/usb/cx231xx/cx231xx-audio.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-core.c	modified	+4	−6	View file
drivers/media/usb/cx231xx/cx231xx-vbi.c	modified	+2	−3	View file
drivers/media/usb/dvb-usb-v2/dvbsky.c	modified	+11	−11	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb-v2/zd1301.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/dib0700_devices.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+7	−1	View file
drivers/media/usb/dvb-usb/gp8psk.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-audio.c	modified	+7	−7	View file
drivers/media/usb/gspca/gspca.c	modified	+1	−0	View file
drivers/media/usb/gspca/ov534.c	modified	+6	−6	View file
drivers/media/usb/msi2500/msi2500.c	modified	+2	−2	View file
drivers/media/usb/pvrusb2/pvrusb2-devattr.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-video.c	modified	+3	−4	View file
drivers/media/usb/uvc/uvc_ctrl.c	modified	+2	−2	View file
drivers/media/usb/zr364xx/zr364xx.c	modified	+24	−9	View file
drivers/media/v4l2-core/v4l2-common.c	modified	+33	−0	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+626	−1167	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+207	−28	View file
drivers/media/v4l2-core/v4l2-device.c	modified	+2	−1	View file
drivers/media/v4l2-core/v4l2-fwnode.c	modified	+5	−27	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+116	−68	View file
drivers/media/v4l2-core/v4l2-subdev.c	modified	+41	−7	View file
drivers/staging/media/Kconfig	modified	+0	−2	View file
drivers/staging/media/Makefile	modified	+0	−1	View file
drivers/staging/media/hantro/hantro_drv.c	modified	+13	−13	View file
drivers/staging/media/hantro/hantro_h264.c	modified	+4	−4	View file
drivers/staging/media/hantro/hantro_hw.h	modified	+1	−3	View file
drivers/staging/media/hantro/hantro_vp8.c	modified	+2	−2	View file
drivers/staging/media/imx/imx-media-csi.c	modified	+1	−9	View file
drivers/staging/media/imx/imx-media.h	modified	+1	−1	View file
drivers/staging/media/ipu3/include/intel-ipu3.h	modified	+4	−4	View file
drivers/staging/media/meson/vdec/vdec.c	modified	+1	−1	View file
drivers/staging/media/rkisp1/Kconfig	deleted	+0	−19	View before deletion
drivers/staging/media/rkisp1/TODO	deleted	+0	−13	View before deletion
drivers/staging/media/rkvdec/rkvdec-h264.c	modified	+4	−4	View file
drivers/staging/media/rkvdec/rkvdec.c	modified	+27	−16	View file
drivers/staging/media/sunxi/cedrus/Makefile	modified	+2	−1	View file
drivers/staging/media/sunxi/cedrus/cedrus.c	modified	+90	−17	View file
drivers/staging/media/sunxi/cedrus/cedrus.h	modified	+27	−0	View file
drivers/staging/media/sunxi/cedrus/cedrus_dec.c	modified	+11	−6	View file
drivers/staging/media/sunxi/cedrus/cedrus_hw.c	modified	+2	−0	View file
drivers/staging/media/sunxi/cedrus/cedrus_regs.h	modified	+80	−0	View file
drivers/staging/media/sunxi/cedrus/cedrus_video.c	modified	+15	−1	View file
drivers/staging/media/sunxi/cedrus/cedrus_vp8.c	added	+907	−0	View file
drivers/staging/media/zoran/zoran_driver.c	modified	+1	−1	View file
include/linux/platform_data/media/coda.h	deleted	+0	−14	View before deletion
include/media/dvbdev.h	modified	+1	−1	View file
include/media/fwht-ctrls.h	deleted	+0	−31	View before deletion
include/media/h264-ctrls.h	deleted	+0	−231	View before deletion
include/media/hevc-ctrls.h	modified	+5	−5	View file
include/media/mpeg2-ctrls.h	modified	+2	−2	View file
include/media/rc-map.h	modified	+2	−0	View file
include/media/v4l2-async.h	modified	+1	−1	View file
include/media/v4l2-common.h	modified	+21	−0	View file
include/media/v4l2-ctrls.h	modified	+1	−3	View file
include/media/v4l2-dev.h	modified	+2	−2	View file
include/media/v4l2-device.h	modified	+1	−1	View file
include/media/v4l2-dv-timings.h	modified	+1	−1	View file
include/media/v4l2-fwnode.h	modified	+50	−79	View file
include/media/v4l2-h264.h	modified	+1	−1	View file
include/media/v4l2-ioctl.h	modified	+10	−0	View file
include/media/v4l2-mediabus.h	modified	+5	−3	View file
include/media/v4l2-subdev.h	modified	+1	−1	View file
include/media/videobuf2-core.h	modified	+1	−1	View file
include/media/vp8-ctrls.h	modified	+5	−3	View file
include/uapi/linux/lirc.h	modified	+3	−1	View file
include/uapi/linux/media-bus-format.h	modified	+8	−0	View file
drivers/staging/media/rkisp1/uapi/rkisp1-config.h → include/uapi/linux/rkisp1-config.h	renamed	+1	−5	View file
include/uapi/linux/v4l2-controls.h	modified	+673	−200	View file
include/uapi/linux/videodev2.h	modified	+28	−13	View file

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

Documentation/admin-guide/media/rkisp1.rst

View file

diff --git a/Documentation/admin-guide/media/rkisp1.rst b/Documentation/admin-guide/media/rkisp1.rst
index 42e37ed..2267e4f 100644
--- a/Documentation/admin-guide/media/rkisp1.rst
+++ b/Documentation/admin-guide/media/rkisp1.rst
@@ -86,7 +86,7 @@ the driver through the rkisp_params node to improve image quality during a
 video stream.
 The buffer format is defined by struct :c:type:`rkisp1_stat_buffer`, and
 userspace should set
-:ref:`V4L2_META_FMT_RK_ISP1_STAT_3A <v4l2-meta-fmt-stat-rkisp1>` as the
+:ref:`V4L2_META_FMT_RK_ISP1_STAT_3A <v4l2-meta-fmt-rk-isp1-stat-3a>` as the
 dataformat.
 
 .. _rkisp1_params:
@@ -100,7 +100,7 @@ and others.
 
 The buffer format is defined by struct :c:type:`rkisp1_params_cfg`, and
 userspace should set
-:ref:`V4L2_META_FMT_RK_ISP1_PARAMS <v4l2-meta-fmt-params-rkisp1>` as the
+:ref:`V4L2_META_FMT_RK_ISP1_PARAMS <v4l2-meta-fmt-rk-isp1-params>` as the
 dataformat.
 
 

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

View file

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml
index 4cc1a67..2f7058f 100644
--- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml
+++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml
@@ -18,6 +18,8 @@ properties:
       - allwinner,sun7i-a20-video-engine
       - allwinner,sun8i-a33-video-engine
       - allwinner,sun8i-h3-video-engine
+      - allwinner,sun8i-v3s-video-engine
+      - allwinner,sun8i-r40-video-engine
       - allwinner,sun50i-a64-video-engine
       - allwinner,sun50i-h5-video-engine
       - allwinner,sun50i-h6-video-engine

Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
new file mode 100644
index 0000000..bee93bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+# Copyright 2020 BayLibre, SAS
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/amlogic,axg-ge2d.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Amlogic GE2D Acceleration Unit
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - amlogic,axg-ge2d
+
+  interrupts:
+    minItems: 1
+
+  reg:
+    minItems: 1
+
+  resets:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - resets
+
+additionalProperties: false
+
+examples:
+  - |
+    ge2d: ge2d@ff940000 {
+          compatible = "amlogic,axg-ge2d";
+          reg = <0xff940000 0x10000>;
+          interrupts = <150>;
+          clocks = <&clk_ge2d>;
+          resets = <&reset_ge2d>;
+    };

Documentation/devicetree/bindings/media/coda.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/coda.txt b/Documentation/devicetree/bindings/media/coda.txt
deleted file mode 100644
index 90eb74c..0000000
--- a/Documentation/devicetree/bindings/media/coda.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Chips&Media Coda multi-standard codec IP
-========================================
-
-Coda codec IPs are present in i.MX SoCs in various versions,
-called VPU (Video Processing Unit).
-
-Required properties:
-- compatible : should be "fsl,<chip>-src" for i.MX SoCs:
-  (a) "fsl,imx27-vpu" for CodaDx6 present in i.MX27
-  (b) "fsl,imx51-vpu" for CodaHx4 present in i.MX51
-  (c) "fsl,imx53-vpu" for CODA7541 present in i.MX53
-  (d) "fsl,imx6q-vpu" for CODA960 present in i.MX6q
-- reg: should be register base and length as documented in the
-  SoC reference manual
-- interrupts : Should contain the VPU interrupt. For CODA960,
-  a second interrupt is needed for the MJPEG unit.
-- clocks : Should contain the ahb and per clocks, in the order
-  determined by the clock-names property.
-- clock-names : Should be "ahb", "per"
-- iram : phandle pointing to the SRAM device node
-
-Example:
-
-vpu: vpu@63ff4000 {
-	compatible = "fsl,imx53-vpu";
-	reg = <0x63ff4000 0x1000>;
-	interrupts = <9>;
-	clocks = <&clks 63>, <&clks 63>;
-	clock-names = "ahb", "per";
-	iram = <&ocram>;
-};

Documentation/devicetree/bindings/media/coda.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/coda.yaml b/Documentation/devicetree/bindings/media/coda.yaml
new file mode 100644
index 0000000..7bac005
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/coda.yaml
@@ -0,0 +1,108 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/coda.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Chips&Media Coda multi-standard codec IP
+
+maintainers:
+  - Philipp Zabel <[email protected]>
+
+description: |-
+  Coda codec IPs are present in i.MX SoCs in various versions,
+  called VPU (Video Processing Unit).
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - const: fsl,imx27-vpu
+          - const: cnm,codadx6
+      - items:
+          - const: fsl,imx51-vpu
+          - const: cnm,codahx4
+      - items:
+          - const: fsl,imx53-vpu
+          - const: cnm,coda7541
+      - items:
+          - enum:
+              - fsl,imx6dl-vpu
+              - fsl,imx6q-vpu
+          - const: cnm,coda960
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: PER clock
+      - description: AHB interface clock
+
+  clock-names:
+    items:
+      - const: per
+      - const: ahb
+
+  resets:
+    maxItems: 1
+
+  iram:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: phandle pointing to the SRAM device node
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - clock-names
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: cnm,coda960
+    then:
+      properties:
+        interrupts:
+          items:
+            - description: BIT processor interrupt
+            - description: JPEG unit interrupt
+
+        interrupt-names:
+          items:
+            - const: bit
+            - const: jpeg
+    else:
+      properties:
+        interrupts:
+          items:
+            - description: BIT processor interrupt
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - fsl,imx6dl-vpu
+              - fsl,imx6q-vpu
+    then:
+      properties:
+        power-domains:
+          $ref: /schemas/types.yaml#/definitions/phandle
+          description: phandle pointing to the PU power domain
+          maxItems: 1
+
+examples:
+  - |
+    vpu: video-codec@63ff4000 {
+        compatible = "fsl,imx53-vpu", "cnm,coda7541";
+        reg = <0x63ff4000 0x1000>;
+        interrupts = <9>;
+        clocks = <&clks 63>, <&clks 63>;
+        clock-names = "per", "ahb";
+        iram = <&ocram>;
+    };

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

View before deletion

diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
deleted file mode 100644
index b3e688b..0000000
--- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-* Analog Devices ADV7604/11/12 video decoder with HDMI receiver
-
-The ADV7604 and ADV7611/12 are multiformat video decoders with an integrated
-HDMI receiver. The ADV7604 has four multiplexed HDMI inputs and one analog
-input, and the ADV7611 has one HDMI input and no analog input. The 7612 is
-similar to the 7611 but has 2 HDMI inputs.
-
-These device tree bindings support the ADV7611/12 only at the moment.
-
-Required Properties:
-
-  - compatible: Must contain one of the following
-    - "adi,adv7611" for the ADV7611
-    - "adi,adv7612" for the ADV7612
-
-  - reg: I2C slave addresses
-    The ADV76xx has up to thirteen 256-byte maps that can be accessed via the
-    main I2C ports. Each map has it own I2C address and acts as a standard
-    slave device on the I2C bus. The main address is mandatory, others are
-    optional and revert to defaults if not specified.
-
-  - hpd-gpios: References to the GPIOs that control the HDMI hot-plug
-    detection pins, one per HDMI input. The active flag indicates the GPIO
-    level that enables hot-plug detection.
-
-The device node must contain one 'port' child node per device 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.
-
-  Port			ADV7611    ADV7612
-------------------------------------------------------------
-  HDMI			0             0, 1
-  Digital output	1                2
-
-The digital output port node must contain at least one endpoint.
-
-Optional Properties:
-
-  - reset-gpios: Reference to the GPIO connected to the device's reset pin.
-  - default-input: Select which input is selected after reset.
-  - reg-names : Names of maps with programmable addresses.
-		It can contain any map needing a non-default address.
-		Possible maps names are :
-		  "main", "avlink", "cec", "infoframe", "esdp", "dpp", "afe",
-		  "rep", "edid", "hdmi", "test", "cp", "vdp"
-
-Optional Endpoint Properties:
-
-  The following three properties are defined in video-interfaces.txt and are
-  valid for source endpoints only.
-
-  - hsync-active: Horizontal synchronization polarity. Defaults to active low.
-  - vsync-active: Vertical synchronization polarity. Defaults to active low.
-  - pclk-sample: Pixel clock polarity. Defaults to output on the falling edge.
-
-  If none of hsync-active, vsync-active and pclk-sample is specified the
-  endpoint will use embedded BT.656 synchronization.
-
-Example:
-
-	hdmi_receiver@4c {
-		compatible = "adi,adv7611";
-		/*
-		 * The edid page will be accessible @ 0x66 on the I2C bus. All
-		 * other maps will retain their default addresses.
-		 */
-		reg = <0x4c>, <0x66>;
-		reg-names = "main", "edid";
-
-		reset-gpios = <&ioexp 0 GPIO_ACTIVE_LOW>;
-		hpd-gpios = <&ioexp 2 GPIO_ACTIVE_HIGH>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		default-input = <0>;
-
-		port@0 {
-			reg = <0>;
-		};
-		port@1 {
-			reg = <1>;
-			hdmi_in: endpoint {
-				remote-endpoint = <&ccdc_in>;
-			};
-		};
-	};

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

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.yaml b/Documentation/devicetree/bindings/media/i2c/adv7604.yaml
new file mode 100644
index 0000000..407badd
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/adv7604.yaml
@@ -0,0 +1,178 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/adv7604.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Analog Devices ADV7604/11/12 video decoder with HDMI receiver
+
+maintainers:
+  - Hans Verkuil <[email protected]>
+
+description:
+  The ADV7604 and ADV7611/12 are multiformat video decoders with an integrated
+  HDMI receiver. The ADV7604 has four multiplexed HDMI inputs and one analog
+  input, and the ADV7611 has one HDMI input and no analog input. The 7612 is
+  similar to the 7611 but has 2 HDMI inputs.
+
+  These device tree bindings support the ADV7611/12 only at the moment.
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - adi,adv7611
+          - adi,adv7612
+
+  reg:
+    minItems: 1
+    maxItems: 13
+
+  reg-names:
+    minItems: 1
+    maxItems: 13
+    items:
+      - const: main
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+      - enum: [ avlink, cec, infoframe, esdp, dpp, afe, rep, edid, hdmi, test, cp, vdp ]
+
+  interrupts:
+    maxItems: 1
+
+  reset-gpios:
+    maxItems: 1
+
+  hpd-gpios:
+    minItems: 1
+    description:
+      References to the GPIOs that control the HDMI hot-plug detection pins,
+      one per HDMI input. The active flag indicates the GPIO level that
+      enables hot-plug detection.
+
+  default-input:
+    maxItems: 1
+    description:
+      Select which input is selected after reset.
+
+  ports:
+    type: object
+    description:
+      A node containing input and output port nodes with endpoint definitions
+      as documented in
+      Documentation/devicetree/bindings/media/video-interfaces.txt
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: adi,adv7611
+    then:
+      properties:
+        ports:
+          properties:
+            '#address-cells':
+              const: 1
+            '#size-cells':
+              const: 0
+            port@0:
+              type: object
+              description: Input port
+            port@1:
+              type: object
+              description: Output port
+
+          required:
+            - port@1
+
+          additionalProperties: false
+
+      required:
+        - ports
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: adi,adv7612
+    then:
+      properties:
+        ports:
+          properties:
+            '#address-cells':
+              const: 1
+            '#size-cells':
+              const: 0
+            port@2:
+              type: object
+              description: Output port
+
+          patternProperties:
+            "^port@[0-1]$":
+              type: object
+              description: Input port
+
+          required:
+            - port@2
+
+          additionalProperties: false
+
+      required:
+        - ports
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            hdmi_receiver@4c {
+                    compatible = "adi,adv7611";
+                    /*
+                     * The edid page will be accessible @ 0x66 on the I2C bus. All
+                     * other maps will retain their default addresses.
+                     */
+                    reg = <0x4c>, <0x66>;
+                    reg-names = "main", "edid";
+
+                    reset-gpios = <&ioexp 0 GPIO_ACTIVE_LOW>;
+                    hpd-gpios = <&ioexp 2 GPIO_ACTIVE_HIGH>;
+                    default-input = <0>;
+
+                    ports {
+                            #address-cells = <1>;
+                            #size-cells = <0>;
+
+                            port@0 {
+                                    reg = <0>;
+                            };
+
+                            port@1 {
+                                    reg = <1>;
+                                    hdmi_in: endpoint {
+                                            remote-endpoint = <&ccdc_in>;
+                                    };
+                            };
+                    };
+
+
+            };
+    };

Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt b/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
deleted file mode 100644
index bd896e9..0000000
--- a/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-* Aptina MT9V111 CMOS sensor
-----------------------------
-
-The Aptina MT9V111 is a 1/4-Inch VGA-format digital image sensor with a core
-based on Aptina MT9V011 sensor and an integrated Image Flow Processor (IFP).
-
-The sensor has an active pixel array of 640x480 pixels and can output a number
-of image resolution and formats controllable through a simple two-wires
-interface.
-
-Required properties:
---------------------
-
-- compatible: shall be "aptina,mt9v111".
-- clocks: reference to the system clock input provider.
-
-Optional properties:
---------------------
-
-- enable-gpios: output enable signal, pin name "OE#". Active low.
-- standby-gpios: low power state control signal, pin name "STANDBY".
-  Active high.
-- reset-gpios: chip reset signal, pin name "RESET#". Active low.
-
-The device node must contain one 'port' child node with one 'endpoint' child
-sub-node for its digital output video port, in accordance with the video
-interface bindings defined in:
-Documentation/devicetree/bindings/media/video-interfaces.txt
-
-Example:
---------
-
-        &i2c1 {
-                camera@48 {
-                        compatible = "aptina,mt9v111";
-                        reg = <0x48>;
-
-                        clocks = <&camera_clk>;
-
-                        port {
-                                mt9v111_out: endpoint {
-                                        remote-endpoint = <&ceu_in>;
-                                };
-                        };
-                };
-        };

Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml b/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
new file mode 100644
index 0000000..ff9546e
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/i2c/aptina,mt9v111.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Aptina MT9V111 CMOS sensor
+
+maintainers:
+  - Jacopo Mondi <[email protected]>
+
+description: |
+  The Aptina MT9V111 is a 1/4-Inch VGA-format digital image sensor with a core
+  based on Aptina MT9V011 sensor and an integrated Image Flow Processor (IFP).
+
+  The sensor has an active pixel array of 640x480 pixels and can output a number
+  of image resolutions and formats controllable through a simple two-wires
+  interface.
+
+properties:
+  compatible:
+    const: aptina,mt9v111
+
+  reg:
+    maxItems: 1