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

9c1958fc · Linus Torvalds <[email protected]> · 2016-07-26 18:59:59 -07:00

Pull media updates from Mauro Carvalho Chehab:

 - new framework support for HDMI CEC and remote control support

 - new encoding codec driver for Mediatek SoC

 - new frontend driver: helene tuner

 - added support for NetUp almost universal devices, with supports
   DVB-C/S/S2/T/T2 and ISDB-T

 - the mn88472 frontend driver got promoted from staging

 - a new driver for RCar video input

 - some soc_camera legacy drivers got removed: timb, omap1, mx2, mx3

 - lots of driver cleanups, improvements and fixups

* tag 'media/v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (377 commits)
  [media] cec: always check all_device_types and features
  [media] cec: poll should check if there is room in the tx queue
  [media] vivid: support monitor all mode
  [media] cec: fix test for unconfigured adapter in main message loop
  [media] cec: limit the size of the transmit queue
  [media] cec: zero unused msg part after msg->len
  [media] cec: don't set fh to NULL in CEC_TRANSMIT
  [media] cec: clear all status fields before transmit and always fill in sequence
  [media] cec: CEC_RECEIVE overwrote the timeout field
  [media] cxd2841er: Reading SNR for DVB-C added
  [media] cxd2841er: Reading BER and UCB for DVB-C added
  [media] cxd2841er: fix switch-case for DVB-C
  [media] cxd2841er: fix signal strength scale for ISDB-T
  [media] cxd2841er: adjust the dB scale for DVB-C
  [media] cxd2841er: provide signal strength for DVB-C
  [media] cxd2841er: fix BER report via DVBv5 stats API
  [media] mb86a20s: apply mask to val after checking for read failure
  [media] airspy: fix error logic during device register
  [media] s5p-cec/TODO: add TODO item
  [media] cec/TODO: drop comment about sphinx documentation
  ...

Commit: 9c1958fc326a0a0a533ec8e86ea6fa30977207de
Parents: 1b3fc0be · 009a6208

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

Changes

446 files changed · +28775 −11176

File	Status	Add	Del	Content
Documentation/DocBook/device-drivers.tmpl	modified	+3	−0	View file
Documentation/DocBook/media/Makefile	modified	+2	−0	View file
Documentation/DocBook/media/v4l/biblio.xml	modified	+10	−0	View file
Documentation/DocBook/media/v4l/cec-api.xml	added	+75	−0	View file
Documentation/DocBook/media/v4l/cec-func-close.xml	added	+64	−0	View file
Documentation/DocBook/media/v4l/cec-func-ioctl.xml	added	+78	−0	View file
Documentation/DocBook/media/v4l/cec-func-open.xml	added	+104	−0	View file
Documentation/DocBook/media/v4l/cec-func-poll.xml	added	+94	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml	added	+151	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml	added	+329	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml	added	+86	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-dqevent.xml	added	+202	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml	added	+255	−0	View file
Documentation/DocBook/media/v4l/cec-ioc-receive.xml	added	+274	−0	View file
Documentation/DocBook/media/v4l/io.xml	modified	+2	−2	View file
Documentation/DocBook/media/v4l/lirc_device_interface.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/media-types.xml	modified	+64	−0	View file
Documentation/DocBook/media/v4l/pixfmt-z16.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-reqbufs.xml	modified	+1	−1	View file
Documentation/DocBook/media_api.tmpl	modified	+5	−1	View file
Documentation/cec.txt	added	+267	−0	View file
Documentation/devicetree/bindings/media/mediatek-vcodec.txt	added	+59	−0	View file
Documentation/devicetree/bindings/media/mediatek-vpu.txt	added	+31	−0	View file
Documentation/devicetree/bindings/media/renesas,fcp.txt	added	+32	−0	View file
Documentation/devicetree/bindings/media/renesas,vsp1.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/media/s5p-cec.txt	added	+31	−0	View file
Documentation/devicetree/bindings/media/s5p-mfc.txt	modified	+31	−8	View file
Documentation/video4linux/CARDLIST.cx23885	modified	+1	−0	View file
Documentation/video4linux/v4l2-controls.txt	modified	+0	−15	View file
Documentation/video4linux/vivid.txt	modified	+31	−5	View file
MAINTAINERS	modified	+63	−11	View file
arch/arm64/boot/dts/mediatek/mt8173.dtsi	modified	+62	−0	View file
arch/blackfin/mach-bf609/boards/ezkit.c	modified	+0	−2	View file
drivers/gpu/drm/rcar-du/rcar_du_vsp.c	modified	+25	−20	View file
drivers/gpu/drm/rcar-du/rcar_du_vsp.h	modified	+2	−0	View file
drivers/input/touchscreen/sur40.c	modified	+5	−16	View file
drivers/media/Kconfig	modified	+3	−0	View file
drivers/media/Makefile	modified	+4	−0	View file
drivers/media/cec-edid.c	added	+168	−0	View file
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c	modified	+2	−2	View file
drivers/media/dvb-core/demux.h	modified	+1	−1	View file
drivers/media/dvb-core/dmxdev.c	modified	+1	−1	View file
drivers/media/dvb-core/dvb_ca_en50221.c	modified	+35	−4	View file
drivers/media/dvb-core/dvb_demux.c	modified	+6	−11	View file
drivers/media/dvb-core/dvb_demux.h	modified	+2	−2	View file
drivers/media/dvb-core/dvb_frontend.c	modified	+25	−8	View file
drivers/media/dvb-core/dvb_net.c	modified	+1	−1	View file
drivers/media/dvb-core/dvb_ringbuffer.c	modified	+61	−13	View file
drivers/media/dvb-frontends/Kconfig	modified	+15	−0	View file
drivers/media/dvb-frontends/Makefile	modified	+2	−0	View file
drivers/media/dvb-frontends/af9033.c	modified	+155	−172	View file
drivers/media/dvb-frontends/ascot2e.c	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2841er.c	modified	+1495	−436	View file
drivers/media/dvb-frontends/cxd2841er.h	modified	+11	−13	View file
drivers/media/dvb-frontends/cxd2841er_priv.h	modified	+1	−0	View file
drivers/media/dvb-frontends/dib0090.c	modified	+6	−0	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+3	−0	View file
drivers/media/dvb-frontends/ds3000.c	modified	+9	−0	View file
drivers/media/dvb-frontends/helene.c	added	+1042	−0	View file
drivers/media/dvb-frontends/helene.h	added	+79	−0	View file
drivers/media/dvb-frontends/horus3a.c	modified	+3	−23	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+65	−79	View file
drivers/media/dvb-frontends/m88ds3103_priv.h	modified	+1	−2	View file
drivers/media/dvb-frontends/m88rs2000.c	modified	+1	−1	View file
drivers/media/dvb-frontends/mb86a20s.c	modified	+2	−1	View file
drivers/staging/media/mn88472/mn88472.c → drivers/media/dvb-frontends/mn88472.c	renamed	+278	−241	View file
drivers/media/dvb-frontends/mn88472.h	modified	+24	−21	View file
drivers/staging/media/mn88472/mn88472_priv.h → drivers/media/dvb-frontends/mn88472_priv.h	renamed	+5	−6	View file
drivers/media/dvb-frontends/mn88473.c	modified	+4	−3	View file
drivers/media/dvb-frontends/rtl2830.c	modified	+89	−114	View file
drivers/media/dvb-frontends/rtl2830_priv.h	modified	+1	−1	View file
drivers/media/dvb-frontends/rtl2832.c	modified	+20	−6	View file
drivers/media/dvb-frontends/rtl2832_priv.h	modified	+1	−0	View file
drivers/media/dvb-frontends/rtl2832_sdr.c	modified	+1	−1	View file
drivers/media/dvb-frontends/si2168.c	modified	+75	−52	View file
drivers/media/dvb-frontends/si2168_priv.h	modified	+7	−1	View file
drivers/media/i2c/Kconfig	modified	+24	−0	View file
drivers/media/i2c/adv7511.c	modified	+412	−33	View file
drivers/media/i2c/adv7604.c	modified	+333	−60	View file
drivers/media/i2c/adv7842.c	modified	+327	−86	View file
drivers/media/i2c/cs53l32a.c	modified	+0	−7	View file
drivers/media/i2c/cx25840/cx25840-core.c	modified	+0	−7	View file
drivers/media/i2c/msp3400-driver.c	modified	+0	−7	View file
drivers/media/i2c/mt9t001.c	modified	+14	−3	View file
drivers/media/i2c/mt9v032.c	modified	+210	−69	View file
drivers/media/i2c/saa7115.c	modified	+0	−7	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+1	−3	View file
drivers/media/i2c/tc358743.c	modified	+1	−14	View file
drivers/media/i2c/tvaudio.c	modified	+0	−7	View file
drivers/media/i2c/wm8775.c	modified	+0	−7	View file
drivers/media/media-device.c	modified	+33	−14	View file
drivers/media/media-devnode.c	modified	+85	−64	View file
drivers/media/pci/bt8xx/dst_ca.c	modified	+0	−2	View file
drivers/media/pci/cobalt/cobalt-driver.c	modified	+0	−11	View file
drivers/media/pci/cobalt/cobalt-driver.h	modified	+0	−1	View file
drivers/media/pci/cobalt/cobalt-v4l2.c	modified	+2	−2	View file
drivers/media/pci/cx18/cx18-alsa-mixer.c	modified	+3	−3	View file
drivers/media/pci/cx18/cx18-driver.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-driver.h	modified	+3	−3	View file
drivers/media/pci/cx18/cx18-ioctl.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-streams.c	modified	+6	−6	View file
drivers/media/pci/cx18/cx18-vbi.c	modified	+3	−3	View file
drivers/media/pci/cx23885/cx23885-417.c	modified	+1	−2	View file
drivers/media/pci/cx23885/cx23885-cards.c	modified	+46	−13	View file
drivers/media/pci/cx23885/cx23885-core.c	modified	+1	−9	View file
drivers/media/pci/cx23885/cx23885-dvb.c	modified	+101	−3	View file
drivers/media/pci/cx23885/cx23885-vbi.c	modified	+1	−2	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+3	−2	View file
drivers/media/pci/cx23885/cx23885.h	modified	+1	−1	View file
drivers/media/pci/cx25821/cx25821-alsa.c	modified	+1	−1	View file
drivers/media/pci/cx25821/cx25821-core.c	modified	+1	−9	View file
drivers/media/pci/cx25821/cx25821-video.c	modified	+2	−3	View file
drivers/media/pci/cx25821/cx25821.h	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-alsa.c	modified	+2	−6	View file
drivers/media/pci/cx88/cx88-blackbird.c	modified	+2	−2	View file
drivers/media/pci/cx88/cx88-dvb.c	modified	+2	−2	View file
drivers/media/pci/cx88/cx88-mpeg.c	modified	+1	−9	View file
drivers/media/pci/cx88/cx88-vbi.c	modified	+1	−2	View file
drivers/media/pci/cx88/cx88-video.c	modified	+3	−10	View file
drivers/media/pci/cx88/cx88.h	modified	+0	−2	View file
drivers/media/pci/ddbridge/ddbridge-core.c	modified	+1	−2	View file
drivers/media/pci/dt3155/dt3155.c	modified	+3	−12	View file
drivers/media/pci/dt3155/dt3155.h	modified	+0	−2	View file
drivers/media/pci/ivtv/ivtv-alsa-mixer.c	modified	+3	−3	View file
drivers/media/pci/netup_unidvb/Kconfig	modified	+6	−1	View file
drivers/media/pci/netup_unidvb/netup_unidvb.h	modified	+10	−0	View file
drivers/media/pci/netup_unidvb/netup_unidvb_ci.c	modified	+2	−2	View file
drivers/media/pci/netup_unidvb/netup_unidvb_core.c	modified	+109	−65	View file
drivers/media/pci/saa7134/saa7134-core.c	modified	+7	−15	View file
drivers/media/pci/saa7134/saa7134-ts.c	modified	+1	−2	View file
drivers/media/pci/saa7134/saa7134-vbi.c	modified	+1	−2	View file
drivers/media/pci/saa7134/saa7134-video.c	modified	+3	−2	View file
drivers/media/pci/saa7134/saa7134.h	modified	+1	−2	View file
drivers/media/pci/saa7164/saa7164-encoder.c	modified	+2	−4	View file
drivers/media/pci/saa7164/saa7164.h	modified	+0	−4	View file
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c	modified	+3	−12	View file
drivers/media/pci/solo6x10/solo6x10-v4l2.c	modified	+17	−27	View file
drivers/media/pci/solo6x10/solo6x10.h	modified	+0	−2	View file
drivers/media/pci/sta2x11/sta2x11_vip.c	modified	+3	−17	View file
drivers/media/pci/tw68/tw68-core.c	modified	+3	−12	View file
drivers/media/pci/tw68/tw68-video.c	modified	+2	−2	View file
drivers/media/pci/tw68/tw68.h	modified	+0	−1	View file
drivers/media/pci/tw686x/Kconfig	modified	+2	−0	View file
drivers/media/pci/tw686x/tw686x-audio.c	modified	+67	−25	View file
drivers/media/pci/tw686x/tw686x-core.c	modified	+48	−8	View file
drivers/media/pci/tw686x/tw686x-regs.h	modified	+9	−0	View file
drivers/media/pci/tw686x/tw686x-video.c	modified	+453	−142	View file
drivers/media/pci/tw686x/tw686x.h	modified	+33	−9	View file
drivers/media/pci/zoran/zr36016.c	modified	+0	−4	View file
drivers/media/platform/Kconfig	modified	+45	−0	View file
drivers/media/platform/Makefile	modified	+7	−0	View file
drivers/media/platform/am437x/am437x-vpfe.c	modified	+3	−11	View file
drivers/media/platform/am437x/am437x-vpfe.h	modified	+0	−2	View file
drivers/media/platform/blackfin/bfin_capture.c	modified	+3	−14	View file
drivers/media/platform/coda/coda-common.c	modified	+4	−16	View file
drivers/media/platform/coda/coda.h	modified	+0	−1	View file
drivers/media/platform/davinci/ccdc_hw_device.h	modified	+0	−7	View file
drivers/media/platform/davinci/vpbe_display.c	modified	+2	−12	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+3	−12	View file
drivers/media/platform/davinci/vpif_capture.h	modified	+0	−2	View file
drivers/media/platform/davinci/vpif_display.c	modified	+3	−12	View file
drivers/media/platform/davinci/vpif_display.h	modified	+0	−2	View file
drivers/media/platform/exynos-gsc/gsc-core.c	modified	+3	−9	View file
drivers/media/platform/exynos-gsc/gsc-core.h	modified	+0	−2	View file
drivers/media/platform/exynos-gsc/gsc-m2m.c	modified	+4	−4	View file
drivers/media/platform/exynos4-is/fimc-capture.c	modified	+3	−6	View file
drivers/media/platform/exynos4-is/fimc-core.c	modified	+2	−10	View file
drivers/media/platform/exynos4-is/fimc-core.h	modified	+0	−3	View file
drivers/media/platform/exynos4-is/fimc-is.c	modified	+3	−12	View file
drivers/media/platform/exynos4-is/fimc-is.h	modified	+0	−2	View file
drivers/media/platform/exynos4-is/fimc-isp-video.c	modified	+4	−7	View file
drivers/media/platform/exynos4-is/fimc-isp.h	modified	+0	−2	View file
drivers/media/platform/exynos4-is/fimc-lite.c	modified	+6	−16	View file
drivers/media/platform/exynos4-is/fimc-lite.h	modified	+0	−2	View file
drivers/media/platform/exynos4-is/fimc-m2m.c	modified	+14	−18	View file
drivers/media/platform/exynos4-is/mipi-csis.c	modified	+0	−17	View file
drivers/media/platform/m2m-deinterlace.c	modified	+3	−14	View file
drivers/media/platform/marvell-ccic/mcam-core.c	modified	+3	−25	View file
drivers/media/platform/marvell-ccic/mcam-core.h	modified	+0	−2	View file
drivers/media/platform/mtk-vcodec/Makefile	added	+19	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h	added	+335	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c	added	+1292	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h	added	+58	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c	added	+439	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c	added	+137	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h	added	+26	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c	added	+54	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h	added	+27	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c	added	+94	−0	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h	added	+87	−0	View file
drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c	added	+679	−0	View file
drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c	added	+486	−0	View file
drivers/media/platform/mtk-vcodec/venc_drv_base.h	added	+62	−0	View file
drivers/media/platform/mtk-vcodec/venc_drv_if.c	added	+113	−0	View file
drivers/media/platform/mtk-vcodec/venc_drv_if.h	added	+163	−0	View file
drivers/media/platform/mtk-vcodec/venc_ipi_msg.h	added	+210	−0	View file
drivers/media/platform/mtk-vcodec/venc_vpu_if.c	added	+238	−0	View file
drivers/media/platform/mtk-vcodec/venc_vpu_if.h	added	+61	−0	View file
drivers/media/platform/mtk-vpu/Makefile	added	+3	−0	View file
drivers/media/platform/mtk-vpu/mtk_vpu.c	added	+946	−0	View file
drivers/media/platform/mtk-vpu/mtk_vpu.h	added	+162	−0	View file
drivers/media/platform/mx2_emmaprp.c	modified	+4	−15	View file
drivers/media/platform/omap/omap_vout.c	modified	+27	−82	View file
drivers/media/platform/omap/omap_voutdef.h	modified	+2	−3	View file
drivers/media/platform/omap3isp/ispvideo.c	modified	+3	−11	View file
drivers/media/platform/omap3isp/ispvideo.h	modified	+0	−1	View file
drivers/media/platform/rcar-fcp.c	added	+181	−0	View file
drivers/media/platform/rcar-vin/Kconfig	added	+11	−0	View file
drivers/media/platform/rcar-vin/Makefile	added	+3	−0	View file
drivers/media/platform/rcar-vin/rcar-core.c	added	+334	−0	View file
drivers/media/platform/rcar-vin/rcar-dma.c	added	+1187	−0	View file
drivers/media/platform/rcar-vin/rcar-v4l2.c	added	+874	−0	View file
drivers/media/platform/rcar-vin/rcar-vin.h	added	+163	−0	View file
drivers/media/platform/rcar_jpu.c	modified	+5	−19	View file
drivers/media/platform/s3c-camif/camif-capture.c	modified	+2	−3	View file
drivers/media/platform/s3c-camif/camif-core.c	modified	+1	−10	View file
drivers/media/platform/s3c-camif/camif-core.h	modified	+0	−2	View file
drivers/media/platform/s5p-g2d/g2d.c	modified	+6	−11	View file
drivers/media/platform/s5p-g2d/g2d.h	modified	+0	−1	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+7	−14	View file
drivers/media/platform/s5p-jpeg/jpeg-core.h	modified	+0	−2	View file
drivers/media/platform/s5p-mfc/s5p_mfc.c	modified	+122	−105	View file
drivers/media/platform/s5p-mfc/s5p_mfc_common.h	modified	+2	−2	View file
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	modified	+13	−15	View file
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	modified	+13	−22	View file
drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h	added	+79	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c	modified	+10	−3	View file
drivers/media/platform/s5p-tv/mixer.h	modified	+0	−2	View file
drivers/media/platform/s5p-tv/mixer_video.c	modified	+5	−14	View file
drivers/media/platform/sh_veu.c	modified	+4	−15	View file
drivers/media/platform/sh_vou.c	modified	+3	−13	View file
drivers/media/platform/soc_camera/Kconfig	modified	+2	−2	View file
drivers/media/platform/soc_camera/Makefile	modified	+1	−1	View file
drivers/media/platform/soc_camera/atmel-isi.c	modified	+2	−13	View file
drivers/media/platform/soc_camera/rcar_vin.c	modified	+2	−12	View file
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c	modified	+3	−14	View file
drivers/media/platform/sti/bdisp/bdisp-filter.h	modified	+0	−304	View file
drivers/media/platform/sti/bdisp/bdisp-hw.c	modified	+305	−0	View file
drivers/media/platform/sti/bdisp/bdisp-v4l2.c	modified	+4	−14	View file
drivers/media/platform/sti/bdisp/bdisp.h	modified	+0	−2	View file
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c	modified	+1	−0	View file
drivers/media/platform/ti-vpe/cal.c	modified	+2	−15	View file
drivers/media/platform/ti-vpe/vpe.c	modified	+5	−17	View file
drivers/media/platform/via-camera.c	modified	+1	−1	View file
drivers/media/platform/vim2m.c	modified	+1	−6	View file
drivers/media/platform/vivid/Kconfig	modified	+8	−0	View file
drivers/media/platform/vivid/Makefile	modified	+4	−0	View file
drivers/media/platform/vivid/vivid-cec.c	added	+241	−0	View file
drivers/media/platform/vivid/vivid-cec.h	added	+33	−0	View file
drivers/media/platform/vivid/vivid-core.c	modified	+109	−9	View file
drivers/media/platform/vivid/vivid-core.h	modified	+27	−0	View file
drivers/media/platform/vivid/vivid-kthread-cap.c	modified	+13	−0	View file
drivers/media/platform/vivid/vivid-sdr-cap.c	modified	+1	−3	View file
drivers/media/platform/vivid/vivid-vbi-cap.c	modified	+1	−1	View file
drivers/media/platform/vivid/vivid-vbi-out.c	modified	+1	−1	View file
drivers/media/platform/vivid/vivid-vid-cap.c	modified	+25	−9	View file
drivers/media/platform/vivid/vivid-vid-common.c	modified	+7	−0	View file
drivers/media/platform/vivid/vivid-vid-out.c	modified	+1	−6	View file
drivers/media/platform/vsp1/Makefile	modified	+2	−1	View file
drivers/media/platform/vsp1/vsp1.h	modified	+7	−4	View file
drivers/media/platform/vsp1/vsp1_bru.c	modified	+8	−4	View file
drivers/media/platform/vsp1/vsp1_clu.c	added	+292	−0	View file
drivers/media/platform/vsp1/vsp1_clu.h	added	+48	−0	View file
drivers/media/platform/vsp1/vsp1_dl.c	modified	+58	−14	View file
drivers/media/platform/vsp1/vsp1_drm.c	modified	+34	−40	View file
drivers/media/platform/vsp1/vsp1_drv.c	modified	+106	−85	View file
drivers/media/platform/vsp1/vsp1_entity.c	modified	+67	−25	View file
drivers/media/platform/vsp1/vsp1_entity.h	modified	+11	−6	View file
drivers/media/platform/vsp1/vsp1_hsit.c	modified	+9	−5	View file
drivers/media/platform/vsp1/vsp1_lif.c	modified	+12	−4	View file
drivers/media/platform/vsp1/vsp1_lut.c	modified	+69	−32	View file
drivers/media/platform/vsp1/vsp1_lut.h	modified	+5	−2	View file
drivers/media/platform/vsp1/vsp1_pipe.c	modified	+21	−37	View file
drivers/media/platform/vsp1/vsp1_pipe.h	modified	+4	−4	View file
drivers/media/platform/vsp1/vsp1_regs.h	modified	+20	−4	View file
drivers/media/platform/vsp1/vsp1_rpf.c	modified	+23	−15	View file
drivers/media/platform/vsp1/vsp1_rwpf.c	modified	+2	−4	View file
drivers/media/platform/vsp1/vsp1_rwpf.h	modified	+13	−1	View file
drivers/media/platform/vsp1/vsp1_sru.c	modified	+9	−5	View file
drivers/media/platform/vsp1/vsp1_uds.c	modified	+11	−5	View file
drivers/media/platform/vsp1/vsp1_uds.h	modified	+1	−1	View file
drivers/media/platform/vsp1/vsp1_video.c	modified	+16	−24	View file
drivers/media/platform/vsp1/vsp1_video.h	modified	+0	−2	View file
drivers/media/platform/vsp1/vsp1_wpf.c	modified	+151	−10	View file
drivers/media/platform/xilinx/xilinx-dma.c	modified	+2	−11	View file
drivers/media/platform/xilinx/xilinx-dma.h	modified	+0	−2	View file
drivers/media/radio/radio-aztech.c	modified	+0	−1	View file
drivers/media/radio/radio-maxiradio.c	modified	+1	−0	View file
drivers/media/rc/ene_ir.c	modified	+1	−1	View file
drivers/media/rc/iguanair.c	modified	+1	−1	View file
drivers/media/rc/ir-lirc-codec.c	modified	+4	−1	View file
drivers/media/rc/ir-rc5-decoder.c	modified	+1	−1	View file
drivers/media/rc/keymaps/Makefile	modified	+2	−0	View file
drivers/media/rc/keymaps/rc-cec.c	added	+182	−0	View file
drivers/media/rc/keymaps/rc-dtt200u.c	added	+59	−0	View file
drivers/media/rc/lirc_dev.c	modified	+140	−159	View file
drivers/media/rc/mceusb.c	modified	+7	−1	View file
drivers/media/rc/nuvoton-cir.c	modified	+15	−123	View file
drivers/media/rc/nuvoton-cir.h	modified	+0	−25	View file
drivers/media/rc/rc-main.c	modified	+9	−2	View file
drivers/media/rc/redrat3.c	modified	+46	−38	View file
drivers/media/rc/winbond-cir.c	modified	+4	−0	View file
drivers/media/tuners/it913x.c	modified	+1	−0	View file
drivers/media/tuners/mt2063.c	modified	+5	−25	View file
drivers/media/tuners/r820t.c	modified	+15	−14	View file
drivers/media/tuners/si2157.c	modified	+2	−1	View file
drivers/media/usb/airspy/airspy.c	modified	+1	−1	View file
drivers/media/usb/au0828/au0828-core.c	modified	+2	−2	View file
drivers/media/usb/au0828/au0828-vbi.c	modified	+1	−1	View file
drivers/media/usb/au0828/au0828-video.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-417.c	modified	+3	−1	View file
drivers/media/usb/dvb-usb-v2/Kconfig	modified	+9	−4	View file
drivers/media/usb/dvb-usb-v2/af9035.c	modified	+164	−111	View file
drivers/media/usb/dvb-usb-v2/af9035.h	modified	+2	−1	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/dtt200u.c	modified	+37	−37	View file
drivers/media/usb/dvb-usb/dvb-usb-dvb.c	modified	+0	−2	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+27	−21	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+0	−11	View file
drivers/media/usb/em28xx/em28xx-i2c.c	modified	+2	−3	View file
drivers/media/usb/em28xx/em28xx-vbi.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+1	−1	View file
drivers/media/usb/go7007/go7007-v4l2.c	modified	+1	−1	View file
drivers/media/usb/gspca/cpia1.c	modified	+1	−1	View file
drivers/media/usb/gspca/gspca.c	modified	+23	−6	View file
drivers/media/usb/gspca/konica.c	modified	+1	−1	View file
drivers/media/usb/gspca/m5602/m5602_bridge.h	modified	+0	−15	View file
drivers/media/usb/gspca/m5602/m5602_core.c	modified	+15	−0	View file
drivers/media/usb/gspca/m5602/m5602_mt9m111.c	modified	+144	−0	View file
drivers/media/usb/gspca/m5602/m5602_mt9m111.h	modified	+0	−144	View file
drivers/media/usb/gspca/m5602/m5602_ov7660.c	modified	+153	−0	View file
drivers/media/usb/gspca/m5602/m5602_ov7660.h	modified	+0	−153	View file
drivers/media/usb/gspca/m5602/m5602_ov9650.c	modified	+152	−0	View file
drivers/media/usb/gspca/m5602/m5602_ov9650.h	modified	+0	−150	View file
drivers/media/usb/gspca/m5602/m5602_po1030.c	modified	+104	−0	View file
drivers/media/usb/gspca/m5602/m5602_po1030.h	modified	+0	−104	View file
drivers/media/usb/gspca/m5602/m5602_s5k4aa.c	modified	+199	−0	View file
drivers/media/usb/gspca/m5602/m5602_s5k4aa.h	modified	+0	−197	View file
drivers/media/usb/gspca/m5602/m5602_s5k83a.c	modified	+124	−0	View file
drivers/media/usb/gspca/m5602/m5602_s5k83a.h	modified	+0	−124	View file
drivers/media/usb/gspca/ov534.c	modified	+3	−4	View file
drivers/media/usb/gspca/sn9c20x.c	modified	+4	−10	View file
drivers/media/usb/gspca/t613.c	modified	+1	−1	View file
drivers/media/usb/gspca/topro.c	modified	+4	−2	View file
drivers/media/usb/gspca/zc3xx.c	modified	+4	−9	View file
drivers/media/usb/hackrf/hackrf.c	modified	+1	−1	View file
drivers/media/usb/hdpvr/hdpvr-core.c	modified	+2	−8	View file
drivers/media/usb/hdpvr/hdpvr-video.c	modified	+3	−3	View file
drivers/media/usb/hdpvr/hdpvr.h	modified	+0	−2	View file
drivers/media/usb/msi2500/msi2500.c	modified	+1	−1	View file
drivers/media/usb/pvrusb2/pvrusb2-hdw.c	modified	+5	−1	View file
drivers/media/usb/pwc/pwc-if.c	modified	+3	−1	View file
drivers/media/usb/s2255/s2255drv.c	modified	+1	−1	View file
drivers/media/usb/stk1160/stk1160-v4l.c	modified	+4	−1	View file
drivers/media/usb/usbtv/usbtv-audio.c	modified	+26	−7	View file
drivers/media/usb/usbtv/usbtv-core.c	modified	+27	−13	View file
drivers/media/usb/usbtv/usbtv-video.c	modified	+45	−16	View file
drivers/media/usb/usbtv/usbtv.h	modified	+18	−4	View file
drivers/media/usb/usbvision/usbvision-core.c	modified	+0	−5	View file
drivers/media/usb/usbvision/usbvision-video.c	modified	+16	−24	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+1	−1	View file
drivers/media/usb/uvc/uvc_queue.c	modified	+1	−1	View file
drivers/media/usb/uvc/uvc_v4l2.c	modified	+17	−2	View file
drivers/media/usb/uvc/uvc_video.c	modified	+1	−0	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+0	−45	View file
drivers/media/v4l2-core/v4l2-flash-led-class.c	modified	+1	−8	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+2	−2	View file
drivers/media/v4l2-core/videobuf2-core.c	modified	+22	−18	View file
drivers/media/v4l2-core/videobuf2-dma-contig.c	modified	+55	−33	View file
drivers/media/v4l2-core/videobuf2-dma-sg.c	modified	+9	−36	View file
drivers/media/v4l2-core/videobuf2-v4l2.c	modified	+28	−25	View file
drivers/media/v4l2-core/videobuf2-vmalloc.c	modified	+5	−4	View file
drivers/of/of_reserved_mem.c	modified	+63	−20	View file
drivers/staging/media/Kconfig	modified	+5	−9	View file
drivers/staging/media/Makefile	modified	+3	−5	View file
drivers/staging/media/cec/Kconfig	added	+15	−0	View file
drivers/staging/media/cec/Makefile	added	+5	−0	View file
drivers/staging/media/cec/TODO	added	+31	−0	View file
drivers/staging/media/cec/cec-adap.c	added	+1654	−0	View file
drivers/staging/media/cec/cec-api.c	added	+579	−0	View file
drivers/staging/media/cec/cec-core.c	added	+409	−0	View file
drivers/staging/media/cec/cec-priv.h	added	+56	−0	View file
drivers/staging/media/davinci_vpfe/vpfe_video.c	modified	+3	−11	View file
drivers/staging/media/davinci_vpfe/vpfe_video.h	modified	+0	−2	View file
drivers/staging/media/lirc/lirc_parallel.c	modified	+4	−4	View file
drivers/staging/media/mn88472/Kconfig	deleted	+0	−7	View before deletion
drivers/staging/media/mn88472/Makefile	deleted	+0	−5	View before deletion
drivers/staging/media/mn88472/TODO	deleted	+0	−21	View before deletion
drivers/staging/media/mx2/Kconfig	deleted	+0	−15	View before deletion
drivers/staging/media/mx2/Makefile	deleted	+0	−3	View before deletion
drivers/staging/media/mx2/TODO	deleted	+0	−10	View before deletion
drivers/staging/media/mx2/mx2_camera.c	deleted	+0	−1636	View before deletion
drivers/staging/media/mx3/Kconfig	deleted	+0	−15	View before deletion
drivers/staging/media/mx3/Makefile	deleted	+0	−3	View before deletion
drivers/staging/media/mx3/TODO	deleted	+0	−10	View before deletion
drivers/staging/media/mx3/mx3_camera.c	deleted	+0	−1264	View before deletion
drivers/staging/media/omap1/Kconfig	deleted	+0	−13	View before deletion
drivers/staging/media/omap1/Makefile	deleted	+0	−3	View before deletion
drivers/staging/media/omap1/TODO	deleted	+0	−8	View before deletion
drivers/staging/media/omap1/omap1_camera.c	deleted	+0	−1702	View before deletion
drivers/staging/media/omap4iss/iss_video.c	modified	+2	−10	View file
drivers/staging/media/omap4iss/iss_video.h	modified	+0	−1	View file
drivers/staging/media/pulse8-cec/Kconfig	added	+10	−0	View file
drivers/staging/media/pulse8-cec/Makefile	added	+1	−0	View file
drivers/staging/media/pulse8-cec/TODO	added	+52	−0	View file
drivers/staging/media/pulse8-cec/pulse8-cec.c	added	+505	−0	View file
drivers/staging/media/s5p-cec/Kconfig	added	+9	−0	View file
drivers/staging/media/s5p-cec/Makefile	added	+2	−0	View file
drivers/staging/media/s5p-cec/TODO	added	+7	−0	View file
drivers/staging/media/s5p-cec/exynos_hdmi_cec.h	added	+38	−0	View file
drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c	added	+209	−0	View file
drivers/staging/media/s5p-cec/regs-cec.h	added	+96	−0	View file
drivers/staging/media/s5p-cec/s5p_cec.c	added	+294	−0	View file
drivers/staging/media/s5p-cec/s5p_cec.h	added	+76	−0	View file
drivers/staging/media/timb/Kconfig	deleted	+0	−11	View before deletion
drivers/staging/media/timb/Makefile	deleted	+0	−1	View before deletion
drivers/staging/media/timb/timblogiw.c	deleted	+0	−870	View before deletion
drivers/staging/media/tw686x-kh/tw686x-kh-video.c	modified	+2	−10	View file
drivers/staging/media/tw686x-kh/tw686x-kh.h	modified	+0	−1	View file
drivers/usb/gadget/function/uvc_queue.c	modified	+1	−1	View file
fs/compat_ioctl.c	modified	+12	−0	View file
include/linux/cec-funcs.h	added	+1899	−0	View file
include/linux/cec.h	added	+1011	−0	View file
include/linux/of_reserved_mem.h	modified	+22	−3	View file
include/media/cec-edid.h	added	+104	−0	View file
include/media/cec.h	added	+241	−0	View file
include/media/davinci/vpbe_display.h	modified	+0	−2	View file
include/media/i2c/adv7511.h	modified	+1	−5	View file
include/media/i2c/adv7604.h	modified	+0	−2	View file
include/media/i2c/adv7842.h	modified	+0	−2	View file
include/media/media-device.h	modified	+1	−4	View file
include/media/media-devnode.h	modified	+35	−11	View file
include/media/rc-core.h	modified	+3	−0	View file
include/media/rc-map.h	modified	+5	−1	View file
include/media/rcar-fcp.h	added	+37	−0	View file
include/media/v4l2-ctrls.h	modified	+12	−22	View file
include/media/v4l2-subdev.h	modified	+0	−21	View file
include/media/videobuf2-core.h	modified	+14	−10	View file
include/media/videobuf2-dma-contig.h	modified	+2	−9	View file
include/media/videobuf2-dma-sg.h	modified	+0	−3	View file
include/media/vsp1.h	modified	+13	−16	View file
include/uapi/linux/media.h	modified	+10	−0	View file
include/uapi/linux/serio.h	modified	+1	−0	View file
include/uapi/linux/videodev2.h	modified	+8	−6	View file
include/uapi/linux/vsp1.h	deleted	+0	−34	View before deletion
samples/v4l/v4l2-pci-skeleton.c	modified	+3	−14	View file

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

Documentation/DocBook/device-drivers.tmpl

View file

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 8c68768..58af32b 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -300,6 +300,9 @@ X!Isound/sound_firmware.c
 !Iinclude/media/media-devnode.h
 !Iinclude/media/media-entity.h
     </sect1>
+    <sect1><title>Consumer Electronics Control devices</title>
+!Iinclude/media/cec-edid.h
+    </sect1>
 
   </chapter>
 

Documentation/DocBook/media/Makefile

View file

diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index 2840ff4..fdc1386 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -64,6 +64,7 @@ IOCTLS = \
 	$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \
 	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \
 	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \
+	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/cec.h) \
 	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
 
 DEFINES = \
@@ -100,6 +101,7 @@ STRUCTS = \
 	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/ && !/_old/)' $(srctree)/include/uapi/linux/dvb/net.h) \
 	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/video.h) \
 	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \
+	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/cec.h) \
 	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
 	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h)
 

Documentation/DocBook/media/v4l/biblio.xml

View file

diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml
index 9beb30f..87f1d24 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -342,6 +342,16 @@ in the frequency range from 87,5 to 108,0 MHz</title>
       <subtitle>Specification Version 1.4a</subtitle>
     </biblioentry>
 
+    <biblioentry id="hdmi2">
+      <abbrev>HDMI2</abbrev>
+      <authorgroup>
+	<corpauthor>HDMI Licensing LLC
+(<ulink url="http://www.hdmi.org">http://www.hdmi.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>High-Definition Multimedia Interface</title>
+      <subtitle>Specification Version 2.0</subtitle>
+    </biblioentry>
+
     <biblioentry id="dp">
       <abbrev>DP</abbrev>
       <authorgroup>

Documentation/DocBook/media/v4l/cec-api.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-api.xml b/Documentation/DocBook/media/v4l/cec-api.xml
new file mode 100644
index 0000000..7062c1f
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-api.xml
@@ -0,0 +1,75 @@
+<partinfo>
+  <authorgroup>
+    <author>
+      <firstname>Hans</firstname>
+      <surname>Verkuil</surname>
+      <affiliation><address><email>[email protected]</email></address></affiliation>
+      <contrib>Initial version.</contrib>
+    </author>
+  </authorgroup>
+  <copyright>
+    <year>2016</year>
+    <holder>Hans Verkuil</holder>
+  </copyright>
+
+  <revhistory>
+    <!-- Put document revisions here, newest first. -->
+    <revision>
+      <revnumber>1.0.0</revnumber>
+      <date>2016-03-17</date>
+      <authorinitials>hv</authorinitials>
+      <revremark>Initial revision</revremark>
+    </revision>
+  </revhistory>
+</partinfo>
+
+<title>CEC API</title>
+
+<chapter id="cec-api">
+  <title>CEC: Consumer Electronics Control</title>
+
+  <section id="cec-intro">
+    <title>Introduction</title>
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+    <para>HDMI connectors provide a single pin for use by the Consumer Electronics
+    Control protocol. This protocol allows different devices connected by an HDMI cable
+    to communicate. The protocol for CEC version 1.4 is defined in supplements 1 (CEC)
+    and 2 (HEAC or HDMI Ethernet and Audio Return Channel) of the HDMI 1.4a
+    (<xref linkend="hdmi" />) specification and the extensions added to CEC version 2.0
+    are defined in chapter 11 of the HDMI 2.0 (<xref linkend="hdmi2" />) specification.
+    </para>
+
+    <para>The bitrate is very slow (effectively no more than 36 bytes per second) and
+    is based on the ancient AV.link protocol used in old SCART connectors. The protocol
+    closely resembles a crazy Rube Goldberg contraption and is an unholy mix of low and
+    high level messages. Some messages, especially those part of the HEAC protocol layered
+    on top of CEC, need to be handled by the kernel, others can be handled either by the
+    kernel or by userspace.</para>
+
+    <para>In addition, CEC can be implemented in HDMI receivers, transmitters and in USB
+    devices that have an HDMI input and an HDMI output and that control just the CEC pin.</para>
+
+    <para>Drivers that support CEC will create a CEC device node (/dev/cecX)
+    to give userspace access to the CEC adapter. The &CEC-ADAP-G-CAPS; ioctl will tell userspace
+    what it is allowed to do.</para>
+  </section>
+</chapter>
+
+<appendix id="cec-user-func">
+  <title>Function Reference</title>
+  <!-- Keep this alphabetically sorted. -->
+  &sub-cec-func-open;
+  &sub-cec-func-close;
+  &sub-cec-func-ioctl;
+  &sub-cec-func-poll;
+  <!-- All ioctls go here. -->
+  &sub-cec-ioc-adap-g-caps;
+  &sub-cec-ioc-adap-g-log-addrs;
+  &sub-cec-ioc-adap-g-phys-addr;
+  &sub-cec-ioc-dqevent;
+  &sub-cec-ioc-g-mode;
+  &sub-cec-ioc-receive;
+</appendix>

Documentation/DocBook/media/v4l/cec-func-close.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-func-close.xml b/Documentation/DocBook/media/v4l/cec-func-close.xml
new file mode 100644
index 0000000..0812c8c
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-func-close.xml
@@ -0,0 +1,64 @@
+<refentry id="cec-func-close">
+  <refmeta>
+    <refentrytitle>cec close()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>cec-close</refname>
+    <refpurpose>Close a cec device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;unistd.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+	<funcdef>int <function>close</function></funcdef>
+	<paramdef>int <parameter>fd</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>fd</parameter></term>
+	<listitem>
+	  <para>&fd;</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+
+    <para>Closes the cec device. Resources associated with the file descriptor
+    are freed. The device configuration remain unchanged.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para><function>close</function> returns 0 on success. On error, -1 is
+    returned, and <varname>errno</varname> is set appropriately. Possible error
+    codes are:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><errorcode>EBADF</errorcode></term>
+	<listitem>
+	  <para><parameter>fd</parameter> is not a valid open file descriptor.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>

Documentation/DocBook/media/v4l/cec-func-ioctl.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-func-ioctl.xml b/Documentation/DocBook/media/v4l/cec-func-ioctl.xml
new file mode 100644
index 0000000..f92817a
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-func-ioctl.xml
@@ -0,0 +1,78 @@
+<refentry id="cec-func-ioctl">
+  <refmeta>
+    <refentrytitle>cec ioctl()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>cec-ioctl</refname>
+    <refpurpose>Control a cec device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;sys/ioctl.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+	<funcdef>int <function>ioctl</function></funcdef>
+	<paramdef>int <parameter>fd</parameter></paramdef>
+	<paramdef>int <parameter>request</parameter></paramdef>
+	<paramdef>void *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>fd</parameter></term>
+	<listitem>
+	  <para>&fd;</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>request</parameter></term>
+	<listitem>
+	  <para>CEC ioctl request code as defined in the cec.h header file,
+	  for example CEC_ADAP_G_CAPS.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>argp</parameter></term>
+	<listitem>
+	  <para>Pointer to a request-specific structure.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+
+    <para>The <function>ioctl()</function> function manipulates cec device
+    parameters. The argument <parameter>fd</parameter> must be an open file
+    descriptor.</para>
+    <para>The ioctl <parameter>request</parameter> code specifies the cec
+    function to be called. It has encoded in it whether the argument is an
+    input, output or read/write parameter, and the size of the argument
+    <parameter>argp</parameter> in bytes.</para>
+    <para>Macros and structures definitions specifying cec ioctl requests and
+    their parameters are located in the cec.h header file. All cec ioctl
+    requests, their respective function and parameters are specified in
+    <xref linkend="cec-user-func" />.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <para>Request-specific error codes are listed in the
+    individual requests descriptions.</para>
+    <para>When an ioctl that takes an output or read/write parameter fails,
+    the parameter remains unmodified.</para>
+  </refsect1>
+</refentry>

Documentation/DocBook/media/v4l/cec-func-open.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-func-open.xml b/Documentation/DocBook/media/v4l/cec-func-open.xml
new file mode 100644
index 0000000..2edc555
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-func-open.xml
@@ -0,0 +1,104 @@
+<refentry id="cec-func-open">
+  <refmeta>
+    <refentrytitle>cec open()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>cec-open</refname>
+    <refpurpose>Open a cec device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;fcntl.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+	<funcdef>int <function>open</function></funcdef>
+	<paramdef>const char *<parameter>device_name</parameter></paramdef>
+	<paramdef>int <parameter>flags</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>device_name</parameter></term>
+	<listitem>
+	  <para>Device to be opened.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>flags</parameter></term>
+	<listitem>
+	  <para>Open flags. Access mode must be <constant>O_RDWR</constant>.
+	  </para>
+	  <para>When the <constant>O_NONBLOCK</constant> flag is
+given, the &CEC-RECEIVE; ioctl will return &EAGAIN; when no message is
+available, and the &CEC-TRANSMIT;, &CEC-ADAP-S-PHYS-ADDR; and
+&CEC-ADAP-S-LOG-ADDRS; ioctls all act in non-blocking mode.</para>
+	  <para>Other flags have no effect.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>Description</title>
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+
+    <para>To open a cec device applications call <function>open()</function>
+    with the desired device name. The function has no side effects; the device
+    configuration remain unchanged.</para>
+    <para>When the device is opened in read-only mode, attempts to modify its
+    configuration will result in an error, and <varname>errno</varname> will be
+    set to <errorcode>EBADF</errorcode>.</para>
+  </refsect1>
+  <refsect1>
+    <title>Return Value</title>
+
+    <para><function>open</function> returns the new file descriptor on success.
+    On error, -1 is returned, and <varname>errno</varname> is set appropriately.
+    Possible error codes include:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><errorcode>EACCES</errorcode></term>
+	<listitem>
+	  <para>The requested access to the file is not allowed.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EMFILE</errorcode></term>
+	<listitem>
+	  <para>The  process  already  has  the  maximum number of files open.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>ENFILE</errorcode></term>
+	<listitem>
+	  <para>The system limit on the total number of open files has been
+	  reached.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>ENOMEM</errorcode></term>
+	<listitem>
+	  <para>Insufficient kernel memory was available.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>ENXIO</errorcode></term>
+	<listitem>
+	  <para>No device corresponding to this device special file exists.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>

Documentation/DocBook/media/v4l/cec-func-poll.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-func-poll.xml b/Documentation/DocBook/media/v4l/cec-func-poll.xml
new file mode 100644
index 0000000..1bddbde
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-func-poll.xml
@@ -0,0 +1,94 @@
+<refentry id="cec-func-poll">
+  <refmeta>
+    <refentrytitle>cec poll()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>cec-poll</refname>
+    <refpurpose>Wait for some event on a file descriptor</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;sys/poll.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+	<funcdef>int <function>poll</function></funcdef>
+	<paramdef>struct pollfd *<parameter>ufds</parameter></paramdef>
+	<paramdef>unsigned int <parameter>nfds</parameter></paramdef>
+	<paramdef>int <parameter>timeout</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+
+    <para>With the <function>poll()</function> function applications
+can wait for CEC events.</para>
+
+    <para>On success <function>poll()</function> returns the number of
+file descriptors that have been selected (that is, file descriptors
+for which the <structfield>revents</structfield> field of the
+respective <structname>pollfd</structname> structure is non-zero).
+CEC devices set the <constant>POLLIN</constant> and
+<constant>POLLRDNORM</constant> flags in the
+<structfield>revents</structfield> field if there are messages in the
+receive queue. If the transmit queue has room for new messages, the
+<constant>POLLOUT</constant> and <constant>POLLWRNORM</constant>
+flags are set. If there are events in the event queue, then the
+<constant>POLLPRI</constant> flag is set.
+When the function timed out it returns a value of zero, on
+failure it returns <returnvalue>-1</returnvalue> and the
+<varname>errno</varname> variable is set appropriately.
+</para>
+
+    <para>For more details see the
+<function>poll()</function> manual page.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, <function>poll()</function> returns the number
+structures which have non-zero <structfield>revents</structfield>
+fields, or zero if the call timed out. On error
+<returnvalue>-1</returnvalue> is returned, and the
+<varname>errno</varname> variable is set appropriately:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><errorcode>EBADF</errorcode></term>
+	<listitem>
+	  <para>One or more of the <parameter>ufds</parameter> members
+specify an invalid file descriptor.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EFAULT</errorcode></term>
+	<listitem>
+	  <para><parameter>ufds</parameter> references an inaccessible
+memory area.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EINTR</errorcode></term>
+	<listitem>
+	  <para>The call was interrupted by a signal.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EINVAL</errorcode></term>
+	<listitem>
+	  <para>The <parameter>nfds</parameter> argument is greater
+than <constant>OPEN_MAX</constant>.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>

Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml

View file

diff --git a/Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml b/Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml
new file mode 100644
index 0000000..3523ef2
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml
@@ -0,0 +1,151 @@
+<refentry id="cec-ioc-adap-g-caps">
+  <refmeta>
+    <refentrytitle>ioctl CEC_ADAP_G_CAPS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>CEC_ADAP_G_CAPS</refname>
+    <refpurpose>Query device capabilities</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+	<funcdef>int <function>ioctl</function></funcdef>
+	<paramdef>int <parameter>fd</parameter></paramdef>
+	<paramdef>int <parameter>request</parameter></paramdef>
+	<paramdef>struct cec_caps *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>fd</parameter></term>
+	<listitem>
+	  <para>File descriptor returned by
+	  <link linkend='cec-func-open'><function>open()</function></link>.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>request</parameter></term>
+	<listitem>
+	  <para>CEC_ADAP_G_CAPS</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>argp</parameter></term>
+	<listitem>
+	  <para></para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      Note: this documents the proposed CEC API. This API is not yet finalized and
+      is currently only available as a staging kernel module.
+    </para>
+
+    <para>All cec devices must support the <constant>CEC_ADAP_G_CAPS</constant>
+    ioctl. To query device information, applications call the ioctl with a
+    pointer to a &cec-caps;. The driver fills the structure and returns
+    the information to the application.
+    The ioctl never fails.</para>
+
+    <table pgwide="1" frame="none" id="cec-caps">
+      <title>struct <structname>cec_caps</structname></title>
+      <tgroup cols="3">
+	&cs-str;
+	<tbody valign="top">
+	  <row>
+	    <entry>char</entry>
+	    <entry><structfield>driver[32]</structfield></entry>
+	    <entry>The name of the cec adapter driver.</entry>
+	  </row>
+	  <row>
+	    <entry>char</entry>
+	    <entry><structfield>name[32]</structfield></entry>
+	    <entry>The name of this CEC adapter. The combination <structfield>driver</structfield>
+	    and <structfield>name</structfield> must be unique.</entry>
+	  </row>
+	  <row>
+	    <entry>__u32</entry>
+	    <entry><structfield>capabilities</structfield></entry>
+	    <entry>The capabilities of the CEC adapter, see <xref
+		linkend="cec-capabilities" />.</entry>
+	  </row>
+	  <row>
+	    <entry>__u32</entry>
+	    <entry><structfield>version</structfield></entry>
+	    <entry>CEC Framework API version, formatted with the
+	    <constant>KERNEL_VERSION()</constant> macro.</entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </table>
+