Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

f4d33337 · Linus Torvalds <[email protected]> · 2014-08-05 16:36:30 -07:00

Pull media updates from Mauro Carvalho Chehab:
 - removal of sn9c102.  This device driver was replaced a long time ago
   by gspca
 - solo6x10 and go7007 webcam drivers moved from staging into
   mainstream.  They were waiting for an API to allow setting the image
   detection matrix
 - SDR drivers moved from staging into mainstream: sdr-msi3101 (renamed
   as msi2500) and rtl2832
 - added SDR driver for airspy
 - added demux driver: si2165
 - rework at several RC subsystem, making the code for RC-5 SZ variant
   to be added at the standard RC5 decoder
 - added decoder for the XMP IR protocol
 - tuner driver moved from staging into mainstream: msi3101 (renamed as
   msi001)
 - added documentation for some additional SDR pixfmt
 - some device tree bindings documented
 - added support for exynos3250 at s5p-jpeg
 - remove the obsolete, unmaintained and broken mx1_camera driver
 - added support for remote controllers at au0828 driver
 - added a RC driver: sunxi-cir
 - several driver fixes, enhancements and cleanups.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (455 commits)
  [media] cx23885: fix UNSET/TUNER_ABSENT confusion
  [media] coda: fix build error by making reset control optional
  [media] radio-miropcm20: fix sparse NULL pointer warning
  [media] MAINTAINERS: Update go7007 pattern
  [media] MAINTAINERS: Update solo6x10 patterns
  [media] media: atmel-isi: add primary DT support
  [media] media: atmel-isi: convert the pdata from pointer to structure
  [media] media: atmel-isi: add v4l2 async probe support
  [media] rcar_vin: add devicetree support
  [media] media: pxa_camera device-tree support
  [media] media: mt9m111: add device-tree suppport
  [media] soc_camera: add support for dt binding soc_camera drivers
  [media] media: soc_camera: pxa_camera documentation device-tree support
  [media] media: mt9m111: add device-tree documentation
  [media] s5p-mfc: remove unnecessary calling to function video_devdata()
  [media] s5p-jpeg: add chroma subsampling adjustment for Exynos3250
  [media] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoC
  [media] s5p-jpeg: Assure proper crop rectangle initialization
  [media] s5p-jpeg: fix g_selection op
  [media] s5p-jpeg: Adjust jpeg_bound_align_image to Exynos3250 needs
  ...

Commit: f4d33337eac4007793ca11fd1ab68d91ce7aa762
Parents: 91c2ff77 · 0f3bf3dc

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

Changes

442 files changed · +16105 −17004

File	Status	Add	Del	Content
Documentation/DocBook/media/Makefile	modified	+1	−1	View file
Documentation/DocBook/media/dvb/dvbproperty.xml	modified	+40	−4	View file
Documentation/DocBook/media/v4l/controls.xml	modified	+334	−74	View file
Documentation/DocBook/media/v4l/dev-raw-vbi.xml	modified	+9	−3	View file
Documentation/DocBook/media/v4l/dev-sdr.xml	modified	+14	−4	View file
Documentation/DocBook/media/v4l/dev-sliced-vbi.xml	modified	+8	−1	View file
Documentation/DocBook/media/v4l/io.xml	modified	+7	−2	View file
Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml	modified	+395	−23	View file
Documentation/DocBook/media/v4l/pixfmt-sdr-cs08.xml	added	+44	−0	View file
Documentation/DocBook/media/v4l/pixfmt-sdr-cs14le.xml	added	+47	−0	View file
Documentation/DocBook/media/v4l/pixfmt-sdr-ru12le.xml	added	+40	−0	View file
Documentation/DocBook/media/v4l/pixfmt-srggb12.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/pixfmt.xml	modified	+56	−5	View file
Documentation/DocBook/media/v4l/selection-api.xml	modified	+47	−48	View file
Documentation/DocBook/media/v4l/v4l2.xml	modified	+8	−0	View file
Documentation/DocBook/media/v4l/vidioc-dqevent.xml	modified	+50	−0	View file
Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml	modified	+43	−8	View file
Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml	modified	+4	−8	View file
Documentation/DocBook/media/v4l/vidioc-g-selection.xml	modified	+19	−21	View file
Documentation/DocBook/media/v4l/vidioc-querycap.xml	modified	+6	−0	View file
Documentation/DocBook/media/v4l/vidioc-queryctrl.xml	modified	+197	−37	View file
Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml	modified	+8	−0	View file
Documentation/devicetree/bindings/media/atmel-isi.txt	added	+51	−0	View file
Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt	modified	+8	−4	View file
Documentation/devicetree/bindings/media/i2c/mt9m111.txt	added	+28	−0	View file
Documentation/devicetree/bindings/media/pxa-camera.txt	added	+43	−0	View file
Documentation/devicetree/bindings/media/rcar_vin.txt	added	+86	−0	View file
Documentation/devicetree/bindings/media/sunxi-ir.txt	added	+23	−0	View file
Documentation/dvb/get_dvb_firmware	modified	+32	−1	View file
Documentation/video4linux/CARDLIST.cx23885	modified	+2	−0	View file
Documentation/video4linux/CARDLIST.em28xx	modified	+1	−1	View file
Documentation/video4linux/v4l2-controls.txt	modified	+39	−24	View file
Documentation/video4linux/v4l2-framework.txt	modified	+1	−7	View file
Documentation/video4linux/v4l2-pci-skeleton.c	modified	+0	−5	View file
Documentation/zh_CN/video4linux/v4l2-framework.txt	modified	+1	−6	View file
MAINTAINERS	modified	+28	−24	View file
drivers/hid/hid-picolcd_cir.c	modified	+1	−1	View file
drivers/media/Kconfig	modified	+10	−2	View file
drivers/media/common/saa7146/saa7146_fops.c	modified	+6	−8	View file
drivers/media/common/siano/Kconfig	modified	+1	−2	View file
drivers/media/common/siano/smsir.c	modified	+1	−1	View file
drivers/media/dvb-core/dvb-usb-ids.h	modified	+2	−0	View file
drivers/media/dvb-core/dvb_frontend.c	modified	+17	−19	View file
drivers/media/dvb-core/dvb_frontend.h	modified	+6	−0	View file
drivers/media/dvb-core/dvbdev.h	modified	+4	−0	View file
drivers/media/dvb-frontends/Kconfig	modified	+18	−0	View file
drivers/media/dvb-frontends/Makefile	modified	+7	−0	View file
drivers/media/dvb-frontends/af9013.c	modified	+0	−1	View file
drivers/media/dvb-frontends/au8522_decoder.c	modified	+121	−59	View file
drivers/media/dvb-frontends/au8522_priv.h	modified	+2	−0	View file
drivers/media/dvb-frontends/cxd2820r.h	modified	+6	−0	View file
drivers/media/dvb-frontends/cxd2820r_c.c	modified	+1	−0	View file
drivers/media/dvb-frontends/cxd2820r_t.c	modified	+1	−0	View file
drivers/media/dvb-frontends/cxd2820r_t2.c	modified	+1	−0	View file
drivers/media/dvb-frontends/dib0090.c	modified	+12	−3	View file
drivers/media/dvb-frontends/dib7000m.c	modified	+1	−4	View file
drivers/media/dvb-frontends/dib7000p.c	modified	+401	−32	View file
drivers/media/dvb-frontends/dib7000p.h	modified	+22	−109	View file
drivers/media/dvb-frontends/dib8000.c	modified	+389	−343	View file
drivers/media/dvb-frontends/dib8000.h	modified	+25	−125	View file
drivers/media/dvb-frontends/dib9000.c	modified	+9	−4	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+109	−119	View file
drivers/media/dvb-frontends/drxd.h	modified	+0	−1	View file
drivers/media/dvb-frontends/drxd_hard.c	modified	+1	−2	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+83	−2	View file
drivers/media/dvb-frontends/m88ds3103_priv.h	modified	+2	−0	View file
drivers/media/dvb-frontends/mb86a20s.c	modified	+13	−22	View file
drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c → drivers/media/dvb-frontends/rtl2832_sdr.c	renamed	+77	−23	View file
drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.h → drivers/media/dvb-frontends/rtl2832_sdr.h	renamed	+0	−0	View file
drivers/media/dvb-frontends/si2165.c	added	+1040	−0	View file
drivers/media/dvb-frontends/si2165.h	added	+62	−0	View file
drivers/media/dvb-frontends/si2165_priv.h	added	+23	−0	View file
drivers/media/dvb-frontends/si2168.c	modified	+104	−162	View file
drivers/media/dvb-frontends/si2168_priv.h	modified	+6	−3	View file
drivers/media/dvb-frontends/stb6100_cfg.h	modified	+16	−26	View file
drivers/media/dvb-frontends/stb6100_proc.h	modified	+10	−24	View file
drivers/media/dvb-frontends/stv0367.c	modified	+2	−7	View file
drivers/media/dvb-frontends/tda18271c2dd.c	modified	+1	−1	View file
drivers/media/dvb-frontends/tda18271c2dd_maps.h	modified	+4	−4	View file
drivers/media/dvb-frontends/tda8261_cfg.h	modified	+11	−19	View file
drivers/media/i2c/Kconfig	modified	+1	−0	View file
drivers/media/i2c/adv7180.c	modified	+0	−1	View file
drivers/media/i2c/adv7604.c	modified	+4	−1	View file
drivers/media/i2c/ir-kbd-i2c.c	modified	+48	−47	View file
drivers/media/i2c/mt9v032.c	modified	+94	−76	View file
drivers/media/i2c/noon010pc30.c	modified	+1	−0	View file
drivers/media/i2c/s5k4ecgx.c	modified	+1	−0	View file
drivers/media/i2c/s5k5baf.c	modified	+2	−0	View file
drivers/media/i2c/s5k6a3.c	modified	+1	−0	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+10	−7	View file
drivers/media/i2c/soc_camera/mt9m001.c	modified	+3	−3	View file
drivers/media/i2c/soc_camera/mt9m111.c	modified	+12	−0	View file
drivers/media/i2c/soc_camera/mt9t031.c	modified	+3	−3	View file
drivers/media/i2c/soc_camera/mt9v022.c	modified	+2	−2	View file
drivers/media/i2c/tvp5150.c	modified	+13	−22	View file
drivers/media/media-device.c	modified	+0	−2	View file
drivers/media/parport/bw-qcam.c	modified	+0	−3	View file
drivers/media/parport/c-qcam.c	modified	+0	−1	View file
drivers/media/parport/pms.c	modified	+0	−1	View file
drivers/media/parport/w9966.c	modified	+0	−1	View file
drivers/media/pci/Kconfig	modified	+1	−0	View file
drivers/media/pci/Makefile	modified	+1	−0	View file
drivers/media/pci/bt8xx/bttv-driver.c	modified	+0	−1	View file
drivers/media/pci/bt8xx/bttv-input.c	modified	+41	−37	View file
drivers/media/pci/bt8xx/bttvp.h	modified	+0	−2	View file
drivers/media/pci/cx18/cx18-alsa.h	modified	+0	−1	View file
drivers/media/pci/cx18/cx18-ioctl.c	modified	+0	−1	View file
drivers/media/pci/cx18/cx18-streams.c	modified	+0	−1	View file
drivers/media/pci/cx23885/Kconfig	modified	+2	−0	View file
drivers/media/pci/cx23885/cx23885-417.c	modified	+4	−4	View file
drivers/media/pci/cx23885/cx23885-cards.c	modified	+57	−4	View file
drivers/media/pci/cx23885/cx23885-dvb.c	modified	+168	−7	View file
drivers/media/pci/cx23885/cx23885-input.c	modified	+1	−1	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+6	−5	View file
drivers/media/pci/cx23885/cx23885.h	modified	+2	−0	View file
drivers/media/pci/cx25821/cx25821-video.c	modified	+0	−4	View file
drivers/media/pci/cx88/cx88-core.c	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-input.c	modified	+28	−10	View file
drivers/media/pci/ddbridge/ddbridge-core.c	modified	+34	−1	View file
drivers/media/pci/dm1105/dm1105.c	modified	+2	−1	View file
drivers/media/pci/ivtv/ivtv-controls.c	modified	+2	−2	View file
drivers/media/pci/ivtv/ivtv-i2c.c	modified	+5	−4	View file
drivers/media/pci/ivtv/ivtv-ioctl.c	modified	+0	−3	View file
drivers/media/pci/ivtv/ivtv-streams.c	modified	+0	−1	View file
drivers/media/pci/meye/meye.c	modified	+0	−3	View file
drivers/media/pci/ngene/ngene-core.c	modified	+2	−5	View file
drivers/media/pci/saa7134/saa7134-core.c	modified	+0	−1	View file
drivers/media/pci/saa7134/saa7134-empress.c	modified	+0	−4	View file
drivers/media/pci/saa7134/saa7134-input.c	modified	+49	−37	View file
drivers/media/pci/saa7134/saa7134-video.c	modified	+0	−2	View file
drivers/media/pci/saa7164/saa7164-dvb.c	modified	+14	−18	View file
drivers/staging/media/solo6x10/Kconfig → drivers/media/pci/solo6x10/Kconfig	renamed	+2	−1	View file
drivers/staging/media/solo6x10/Makefile → drivers/media/pci/solo6x10/Makefile	renamed	+1	−1	View file
drivers/staging/media/solo6x10/solo6x10-core.c → drivers/media/pci/solo6x10/solo6x10-core.c	renamed	+1	−5	View file
drivers/staging/media/solo6x10/solo6x10-disp.c → drivers/media/pci/solo6x10/solo6x10-disp.c	renamed	+10	−10	View file
drivers/staging/media/solo6x10/solo6x10-eeprom.c → drivers/media/pci/solo6x10/solo6x10-eeprom.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-enc.c → drivers/media/pci/solo6x10/solo6x10-enc.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-g723.c → drivers/media/pci/solo6x10/solo6x10-g723.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-gpio.c → drivers/media/pci/solo6x10/solo6x10-gpio.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-i2c.c → drivers/media/pci/solo6x10/solo6x10-i2c.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-jpeg.h → drivers/media/pci/solo6x10/solo6x10-jpeg.h	renamed	+1	−5	View file
drivers/staging/media/solo6x10/solo6x10-offsets.h → drivers/media/pci/solo6x10/solo6x10-offsets.h	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-p2m.c → drivers/media/pci/solo6x10/solo6x10-p2m.c	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-regs.h → drivers/media/pci/solo6x10/solo6x10-regs.h	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-tw28.c → drivers/media/pci/solo6x10/solo6x10-tw28.c	renamed	+1	−4	View file
drivers/staging/media/solo6x10/solo6x10-tw28.h → drivers/media/pci/solo6x10/solo6x10-tw28.h	renamed	+0	−4	View file
drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c → drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c	renamed	+114	−93	View file
drivers/staging/media/solo6x10/solo6x10-v4l2.c → drivers/media/pci/solo6x10/solo6x10-v4l2.c	renamed	+4	−5	View file
drivers/staging/media/solo6x10/solo6x10.h → drivers/media/pci/solo6x10/solo6x10.h	renamed	+6	−24	View file
drivers/media/pci/sta2x11/sta2x11_vip.c	modified	+0	−2	View file
drivers/media/pci/ttpci/budget-ci.c	modified	+5	−5	View file
drivers/media/pci/zoran/zr36050.h	modified	+0	−1	View file
drivers/media/platform/Kconfig	modified	+5	−2	View file
drivers/media/platform/arv.c	modified	+0	−1	View file
drivers/media/platform/blackfin/bfin_capture.c	modified	+4	−5	View file
drivers/media/platform/blackfin/ppi.c	modified	+22	−3	View file
drivers/media/platform/coda.c	modified	+1052	−466	View file
drivers/media/platform/coda.h	modified	+112	−3	View file
drivers/media/platform/davinci/dm644x_ccdc.c	modified	+0	−5	View file
drivers/media/platform/davinci/vpbe_display.c	modified	+0	−1	View file
drivers/media/platform/davinci/vpfe_capture.c	modified	+0	−1	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+56	−192	View file
drivers/media/platform/davinci/vpif_capture.h	modified	+0	−11	View file
drivers/media/platform/davinci/vpif_display.c	modified	+1	−3	View file
drivers/media/platform/m2m-deinterlace.c	modified	+2	−5	View file
drivers/media/platform/mem2mem_testdev.c	modified	+0	−1	View file
drivers/media/platform/omap/omap_vout.c	modified	+0	−2	View file
drivers/media/platform/s3c-camif/camif-capture.c	modified	+2	−1	View file
drivers/media/platform/s5p-jpeg/Makefile	modified	+1	−1	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+615	−45	View file
drivers/media/platform/s5p-jpeg/jpeg-core.h	modified	+26	−6	View file
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c	added	+487	−0	View file
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h	added	+60	−0	View file
drivers/media/platform/s5p-jpeg/jpeg-regs.h	modified	+246	−1	View file
drivers/media/platform/s5p-mfc/s5p_mfc.c	modified	+11	−6	View file
drivers/media/platform/s5p-mfc/s5p_mfc_common.h	modified	+10	−1	View file
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c	modified	+12	−37	View file
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	modified	+6	−3	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c	modified	+4	−2	View file
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c	modified	+24	−0	View file
drivers/media/platform/s5p-tv/mixer_video.c	modified	+0	−2	View file
drivers/media/platform/sh_veu.c	modified	+0	−2	View file
drivers/media/platform/soc_camera/Kconfig	modified	+4	−14	View file
drivers/media/platform/soc_camera/Makefile	modified	+0	−1	View file
drivers/media/platform/soc_camera/atmel-isi.c	modified	+78	−12	View file
drivers/media/platform/soc_camera/mx1_camera.c	deleted	+0	−866	View before deletion
drivers/media/platform/soc_camera/pxa_camera.c	modified	+79	−2	View file
drivers/media/platform/soc_camera/rcar_vin.c	modified	+70	−12	View file
drivers/media/platform/soc_camera/soc_camera.c	modified	+136	−5	View file
drivers/media/platform/vino.c	modified	+0	−5	View file
drivers/media/platform/vivi.c	modified	+6	−5	View file
drivers/media/platform/vsp1/vsp1.h	modified	+7	−7	View file
drivers/media/platform/vsp1/vsp1_bru.c	modified	+71	−14	View file
drivers/media/platform/vsp1/vsp1_bru.h	modified	+8	−1	View file
drivers/media/platform/vsp1/vsp1_drv.c	modified	+9	−13	View file
drivers/media/platform/vsp1/vsp1_entity.c	modified	+42	−0	View file
drivers/media/platform/vsp1/vsp1_entity.h	modified	+10	−0	View file
drivers/media/platform/vsp1/vsp1_regs.h	modified	+2	−0	View file
drivers/media/platform/vsp1/vsp1_rpf.c	modified	+61	−11	View file
drivers/media/platform/vsp1/vsp1_rwpf.h	modified	+2	−0	View file
drivers/media/platform/vsp1/vsp1_sru.c	modified	+67	−40	View file
drivers/media/platform/vsp1/vsp1_sru.h	modified	+0	−1	View file
drivers/media/platform/vsp1/vsp1_uds.c	modified	+36	−27	View file
drivers/media/platform/vsp1/vsp1_uds.h	modified	+3	−3	View file
drivers/media/platform/vsp1/vsp1_video.c	modified	+167	−52	View file
drivers/media/platform/vsp1/vsp1_video.h	modified	+9	−2	View file
drivers/media/platform/vsp1/vsp1_wpf.c	modified	+64	−8	View file
drivers/media/radio/dsbr100.c	modified	+0	−1	View file
drivers/media/radio/radio-cadet.c	modified	+0	−1	View file
drivers/media/radio/radio-isa.c	modified	+0	−1	View file
drivers/media/radio/radio-keene.c	modified	+1	−2	View file
drivers/media/radio/radio-ma901.c	modified	+0	−1	View file
drivers/media/radio/radio-miropcm20.c	modified	+286	−18	View file
drivers/media/radio/radio-mr800.c	modified	+1	−2	View file
drivers/media/radio/radio-raremono.c	modified	+0	−1	View file
drivers/media/radio/radio-sf16fmi.c	modified	+0	−1	View file
drivers/media/radio/radio-si476x.c	modified	+0	−1	View file
drivers/media/radio/radio-tea5764.c	modified	+0	−1	View file
drivers/media/radio/radio-tea5777.c	modified	+0	−1	View file
drivers/media/radio/radio-timb.c	modified	+0	−1	View file
drivers/media/radio/si470x/radio-si470x-usb.c	modified	+0	−1	View file
drivers/media/radio/si4713/radio-platform-si4713.c	modified	+0	−1	View file
drivers/media/radio/si4713/radio-usb-si4713.c	modified	+0	−1	View file
drivers/media/radio/si4713/si4713.c	modified	+77	−3	View file
drivers/media/radio/si4713/si4713.h	modified	+9	−0	View file
drivers/media/radio/tea575x.c	modified	+0	−1	View file
drivers/media/rc/Kconfig	modified	+20	−12	View file
drivers/media/rc/Makefile	modified	+3	−2	View file
drivers/media/rc/ati_remote.c	modified	+67	−92	View file
drivers/media/rc/ene_ir.c	modified	+1	−1	View file
drivers/media/rc/fintek-cir.c	modified	+3	−3	View file
drivers/media/rc/gpio-ir-recv.c	modified	+2	−2	View file
drivers/media/rc/iguanair.c	modified	+1	−1	View file
drivers/media/rc/img-ir/img-ir-core.c	modified	+5	−0	View file
drivers/media/rc/img-ir/img-ir-hw.c	modified	+19	−12	View file
drivers/media/rc/img-ir/img-ir-hw.h	modified	+7	−1	View file
drivers/media/rc/img-ir/img-ir-jvc.c	modified	+8	−1	View file
drivers/media/rc/img-ir/img-ir-nec.c	modified	+8	−1	View file
drivers/media/rc/img-ir/img-ir-raw.c	modified	+5	−0	View file
drivers/media/rc/img-ir/img-ir-raw.h	modified	+5	−0	View file
drivers/media/rc/img-ir/img-ir-sanyo.c	modified	+8	−1	View file
drivers/media/rc/img-ir/img-ir-sharp.c	modified	+8	−1	View file
drivers/media/rc/img-ir/img-ir-sony.c	modified	+13	−4	View file
drivers/media/rc/img-ir/img-ir.h	modified	+5	−0	View file
drivers/media/rc/imon.c	modified	+11	−9	View file
drivers/media/rc/ir-jvc-decoder.c	modified	+2	−2	View file
drivers/media/rc/ir-lirc-codec.c	modified	+1	−1	View file
drivers/media/rc/ir-mce_kbd-decoder.c	modified	+1	−1	View file
drivers/media/rc/ir-nec-decoder.c	modified	+2	−2	View file
drivers/media/rc/ir-rc5-decoder.c	modified	+49	−36	View file
drivers/media/rc/ir-rc5-sz-decoder.c	deleted	+0	−154	View before deletion
drivers/media/rc/ir-rc6-decoder.c	modified	+31	−12	View file
drivers/media/rc/ir-sanyo-decoder.c	modified	+2	−2	View file
drivers/media/rc/ir-sharp-decoder.c	modified	+2	−2	View file
drivers/media/rc/ir-sony-decoder.c	modified	+10	−6	View file
drivers/media/rc/ir-xmp-decoder.c	added	+225	−0	View file
drivers/media/rc/ite-cir.c	modified	+3	−3	View file
drivers/media/rc/keymaps/rc-ati-x10.c	modified	+63	−29	View file
drivers/media/rc/keymaps/rc-behold.c	modified	+34	−34	View file
drivers/media/rc/keymaps/rc-nebula.c	modified	+56	−56	View file
drivers/media/rc/keymaps/rc-streamzap.c	modified	+1	−3	View file
drivers/media/rc/mceusb.c	modified	+26	−7	View file
drivers/media/rc/nuvoton-cir.c	modified	+3	−3	View file
drivers/media/rc/rc-core-priv.h	modified	+13	−7	View file
drivers/media/rc/ir-raw.c → drivers/media/rc/rc-ir-raw.c	renamed	+10	−2	View file
drivers/media/rc/rc-loopback.c	modified	+1	−1	View file
drivers/media/rc/rc-main.c	modified	+165	−136	View file
drivers/media/rc/redrat3.c	modified	+1	−1	View file
drivers/media/rc/st_rc.c	modified	+1	−1	View file
drivers/media/rc/streamzap.c	modified	+1	−11	View file
drivers/media/rc/sunxi-cir.c	added	+318	−0	View file
drivers/media/rc/ttusbir.c	modified	+1	−1	View file
drivers/media/rc/winbond-cir.c	modified	+1	−1	View file
drivers/media/tuners/Kconfig	modified	+9	−2	View file
drivers/media/tuners/Makefile	modified	+1	−0	View file
drivers/staging/media/msi3101/msi001.c → drivers/media/tuners/msi001.c	renamed	+1	−1	View file
drivers/media/tuners/r820t.c	modified	+1	−2	View file
drivers/media/tuners/si2157.c	modified	+189	−68	View file
drivers/media/tuners/si2157.h	modified	+6	−1	View file
drivers/media/tuners/si2157_priv.h	modified	+7	−2	View file
drivers/media/tuners/tuner-xc2028.c	modified	+0	−1	View file
drivers/media/tuners/xc4000.c	modified	+33	−15	View file
drivers/media/tuners/xc5000.c	modified	+92	−72	View file
drivers/media/usb/Kconfig	modified	+7	−0	View file
drivers/media/usb/Makefile	modified	+3	−0	View file
drivers/media/usb/airspy/Kconfig	added	+10	−0	View file
drivers/media/usb/airspy/Makefile	added	+1	−0	View file
drivers/media/usb/airspy/airspy.c	added	+1132	−0	View file
drivers/media/usb/au0828/Kconfig	modified	+8	−0	View file
drivers/media/usb/au0828/Makefile	modified	+4	−0	View file
drivers/media/usb/au0828/au0828-cards.c	modified	+4	−3	View file
drivers/media/usb/au0828/au0828-core.c	modified	+21	−4	View file
drivers/media/usb/au0828/au0828-i2c.c	modified	+24	−13	View file
drivers/media/usb/au0828/au0828-input.c	added	+386	−0	View file
drivers/media/usb/au0828/au0828-video.c	modified	+34	−28	View file
drivers/media/usb/au0828/au0828.h	modified	+11	−0	View file
drivers/media/usb/cpia2/cpia2_v4l.c	modified	+0	−1	View file
drivers/media/usb/cx231xx/Kconfig	modified	+2	−0	View file
drivers/media/usb/cx231xx/cx231xx-417.c	modified	+0	−3	View file
drivers/media/usb/cx231xx/cx231xx-avcore.c	modified	+1	−0	View file
drivers/media/usb/cx231xx/cx231xx-cards.c	modified	+281	−122	View file
drivers/media/usb/cx231xx/cx231xx-core.c	modified	+3	−0	View file
drivers/media/usb/cx231xx/cx231xx-dvb.c	modified	+105	−0	View file
drivers/media/usb/cx231xx/cx231xx-input.c	modified	+8	−14	View file
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c	modified	+7	−3	View file
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-video.c	modified	+5	−9	View file
drivers/media/usb/cx231xx/cx231xx.h	modified	+2	−0	View file
drivers/media/usb/dvb-usb-v2/Kconfig	modified	+1	−0	View file
drivers/media/usb/dvb-usb-v2/af9015.c	modified	+11	−7	View file
drivers/media/usb/dvb-usb-v2/af9035.c	modified	+24	−4	View file
drivers/media/usb/dvb-usb-v2/anysee.c	modified	+2	−1	View file
drivers/media/usb/dvb-usb-v2/az6007.c	modified	+14	−11	View file
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/lmedm04.c	modified	+18	−16	View file
drivers/media/usb/dvb-usb-v2/mxl111sf.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+8	−6	View file
drivers/media/usb/dvb-usb/Kconfig	modified	+3	−0	View file
drivers/media/usb/dvb-usb/cxusb.c	modified	+219	−14	View file
drivers/media/usb/dvb-usb/cxusb.h	modified	+2	−0	View file
drivers/media/usb/dvb-usb/dib0700_core.c	modified	+26	−19	View file
drivers/media/usb/dvb-usb/dib0700_devices.c	modified	+402	−234	View file
drivers/media/usb/dvb-usb/dibusb.h	modified	+1	−1	View file
drivers/media/usb/dvb-usb/dvb-usb-remote.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+15	−6	View file
drivers/media/usb/dvb-usb/m920x.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/pctv452e.c	modified	+4	−4	View file
drivers/media/usb/dvb-usb/technisat-usb2.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/ttusb2.c	modified	+3	−3	View file
drivers/media/usb/em28xx/em28xx-camera.c	modified	+2	−2	View file
drivers/media/usb/em28xx/em28xx-cards.c	modified	+2	−1	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+18	−22	View file
drivers/media/usb/em28xx/em28xx-i2c.c	modified	+6	−0	View file
drivers/media/usb/em28xx/em28xx-input.c	modified	+62	−44	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+46	−70	View file
drivers/media/usb/em28xx/em28xx.h	modified	+0	−8	View file
drivers/staging/media/go7007/Kconfig → drivers/media/usb/go7007/Kconfig	renamed	+0	−0	View file
drivers/staging/media/go7007/Makefile → drivers/media/usb/go7007/Makefile	renamed	+0	−4	View file
drivers/staging/media/go7007/go7007-driver.c → drivers/media/usb/go7007/go7007-driver.c	renamed	+94	−39	View file
drivers/staging/media/go7007/go7007-fw.c → drivers/media/usb/go7007/go7007-fw.c	renamed	+16	−16	View file
drivers/staging/media/go7007/go7007-i2c.c → drivers/media/usb/go7007/go7007-i2c.c	renamed	+0	−4	View file
drivers/staging/media/go7007/go7007-loader.c → drivers/media/usb/go7007/go7007-loader.c	renamed	+0	−4	View file
drivers/staging/media/go7007/go7007-priv.h → drivers/media/usb/go7007/go7007-priv.h	renamed	+16	−4	View file
drivers/staging/media/go7007/go7007-usb.c → drivers/media/usb/go7007/go7007-usb.c	renamed	+0	−4	View file
drivers/staging/media/go7007/go7007-v4l2.c → drivers/media/usb/go7007/go7007-v4l2.c	renamed	+220	−102	View file
drivers/staging/media/go7007/s2250-board.c → drivers/media/usb/go7007/s2250-board.c	renamed	+3	−6	View file
drivers/staging/media/go7007/snd-go7007.c → drivers/media/usb/go7007/snd-go7007.c	renamed	+0	−4	View file
drivers/media/usb/gspca/autogain_functions.c	modified	+2	−2	View file
drivers/media/usb/gspca/gspca.c	modified	+18	−11	View file
drivers/media/usb/gspca/gspca.h	modified	+1	−0	View file
drivers/media/usb/gspca/kinect.c	modified	+87	−11	View file
drivers/media/usb/gspca/pac7302.c	modified	+4	−4	View file
drivers/media/usb/gspca/sonixb.c	modified	+1	−1	View file
drivers/media/usb/hdpvr/hdpvr-video.c	modified	+1	−3	View file
drivers/media/usb/msi2500/Kconfig	added	+5	−0	View file
drivers/media/usb/msi2500/Makefile	added	+1	−0	View file
drivers/staging/media/msi3101/sdr-msi3101.c → drivers/media/usb/msi2500/msi2500.c	renamed	+318	−500	View file
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c	modified	+3	−9	View file
drivers/media/usb/pwc/pwc-if.c	modified	+0	−1	View file
drivers/media/usb/s2255/s2255drv.c	modified	+0	−1	View file
drivers/media/usb/stk1160/stk1160-v4l.c	modified	+0	−1	View file
drivers/media/usb/stkwebcam/stk-webcam.c	modified	+0	−3	View file
drivers/media/usb/tlg2300/pd-main.c	modified	+2	−0	View file
drivers/media/usb/tlg2300/pd-radio.c	modified	+0	−1	View file
drivers/media/usb/tlg2300/pd-video.c	modified	+0	−1	View file
drivers/media/usb/tm6000/tm6000-input.c	modified	+37	−18	View file
drivers/media/usb/tm6000/tm6000-video.c	modified	+0	−3	View file
drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c	modified	+1	−2	View file
drivers/media/usb/usbtv/usbtv-core.c	modified	+2	−0	View file
drivers/media/usb/usbtv/usbtv-video.c	modified	+0	−1	View file
drivers/media/usb/usbvision/usbvision-core.c	modified	+5	−11	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+0	−1	View file
drivers/media/usb/zr364xx/zr364xx.c	modified	+0	−4	View file
drivers/media/v4l2-core/v4l2-common.c	modified	+5	−1	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+14	−5	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+686	−285	View file
drivers/media/v4l2-core/v4l2-dev.c	modified	+7	−7	View file
drivers/media/v4l2-core/v4l2-fh.c	modified	+9	−4	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+188	−51	View file
drivers/media/v4l2-core/v4l2-mem2mem.c	modified	+8	−3	View file
drivers/media/v4l2-core/v4l2-subdev.c	modified	+79	−46	View file
drivers/media/v4l2-core/videobuf-dma-sg.c	modified	+58	−4	View file
drivers/media/v4l2-core/videobuf2-core.c	modified	+85	−44	View file
drivers/media/v4l2-core/videobuf2-dma-contig.c	modified	+8	−0	View file
drivers/staging/media/Kconfig	modified	+0	−10	View file
drivers/staging/media/Makefile	modified	+0	−5	View file
drivers/staging/media/bcm2048/radio-bcm2048.c	modified	+11	−11	View file
drivers/staging/media/davinci_vpfe/dm365_ipipe.c	modified	+2	−0	View file
drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h	modified	+0	−1	View file
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c	modified	+3	−2	View file
drivers/staging/media/davinci_vpfe/dm365_resizer.c	modified	+2	−2	View file
drivers/staging/media/davinci_vpfe/vpfe_video.c	modified	+0	−1	View file
drivers/staging/media/go7007/README	deleted	+0	−137	View before deletion
drivers/staging/media/go7007/go7007.h	deleted	+0	−40	View before deletion
drivers/staging/media/go7007/go7007.txt	deleted	+0	−478	View before deletion
drivers/staging/media/go7007/saa7134-go7007.c	deleted	+0	−567	View before deletion
drivers/staging/media/lirc/lirc_igorplugusb.c	modified	+0	−6	View file
drivers/staging/media/lirc/lirc_imon.c	modified	+3	−6	View file
drivers/staging/media/lirc/lirc_parallel.c	modified	+16	−16	View file
drivers/staging/media/lirc/lirc_serial.c	modified	+7	−30	View file
drivers/staging/media/msi3101/Kconfig	deleted	+0	−10	View before deletion
drivers/staging/media/msi3101/Makefile	deleted	+0	−2	View before deletion
drivers/staging/media/omap4iss/iss.c	modified	+9	−77	View file
drivers/staging/media/omap4iss/iss.h	modified	+1	−1	View file
drivers/staging/media/omap4iss/iss_csi2.c	modified	+1	−1	View file
drivers/staging/media/omap4iss/iss_video.c	modified	+12	−10	View file
drivers/staging/media/rtl2832u_sdr/Kconfig	deleted	+0	−7	View before deletion
drivers/staging/media/rtl2832u_sdr/Makefile	deleted	+0	−6	View before deletion
drivers/staging/media/sn9c102/Kconfig	deleted	+0	−17	View before deletion
drivers/staging/media/sn9c102/Makefile	deleted	+0	−15	View before deletion
drivers/staging/media/sn9c102/sn9c102.h	deleted	+0	−214	View before deletion
drivers/staging/media/sn9c102/sn9c102.txt	deleted	+0	−592	View before deletion
drivers/staging/media/sn9c102/sn9c102_config.h	deleted	+0	−86	View before deletion
drivers/staging/media/sn9c102/sn9c102_core.c	deleted	+0	−3465	View before deletion
drivers/staging/media/sn9c102/sn9c102_devtable.h	deleted	+0	−145	View before deletion
drivers/staging/media/sn9c102/sn9c102_hv7131d.c	deleted	+0	−269	View before deletion
drivers/staging/media/sn9c102/sn9c102_hv7131r.c	deleted	+0	−369	View before deletion
drivers/staging/media/sn9c102/sn9c102_mi0343.c	deleted	+0	−352	View before deletion
drivers/staging/media/sn9c102/sn9c102_mi0360.c	deleted	+0	−453	View before deletion
drivers/staging/media/sn9c102/sn9c102_mt9v111.c	deleted	+0	−260	View before deletion
drivers/staging/media/sn9c102/sn9c102_ov7630.c	deleted	+0	−634	View before deletion
drivers/staging/media/sn9c102/sn9c102_ov7660.c	deleted	+0	−546	View before deletion
drivers/staging/media/sn9c102/sn9c102_pas106b.c	deleted	+0	−308	View before deletion
drivers/staging/media/sn9c102/sn9c102_pas202bcb.c	deleted	+0	−340	View before deletion
drivers/staging/media/sn9c102/sn9c102_sensor.h	deleted	+0	−307	View before deletion
drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c	deleted	+0	−154	View before deletion
drivers/staging/media/sn9c102/sn9c102_tas5110d.c	deleted	+0	−119	View before deletion
drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c	deleted	+0	−165	View before deletion
drivers/staging/media/solo6x10/TODO	deleted	+0	−15	View before deletion
include/media/atmel-isi.h	modified	+4	−0	View file
include/media/blackfin/ppi.h	modified	+3	−1	View file
include/media/ir-kbd-i2c.h	modified	+4	−2	View file
include/media/rc-core.h	modified	+21	−50	View file
include/media/rc-map.h	modified	+15	−1	View file
include/media/v4l2-ctrls.h	modified	+173	−49	View file
include/media/v4l2-dev.h	modified	+0	−2	View file
include/media/v4l2-ioctl.h	modified	+2	−0	View file
include/media/v4l2-mem2mem.h	modified	+2	−0	View file
include/media/videobuf-dma-sg.h	modified	+3	−0	View file
include/media/videobuf2-core.h	modified	+13	−6	View file
include/uapi/linux/v4l2-controls.h	modified	+32	−0	View file
include/uapi/linux/videodev2.h	modified	+96	−5	View file

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

Documentation/DocBook/media/Makefile

View file

diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index 639e748..df2962d 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -174,7 +174,7 @@ FILENAME = \
 DOCUMENTED = \
 	-e "s/\(enum *\)v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1<link linkend=\"\2\">v4l2_mpeg_cx2341x_video_\2<\/link>/g" \
 	-e "s/\(\(enum\|struct\) *\)\(v4l2_[a-zA-Z0-9_]*\)/\1<link linkend=\"\3\">\3<\/link>/g" \
-	-e "s/\(V4L2_PIX_FMT_[A-Z0-9_]\+\) /<link linkend=\"\1\">\1<\/link> /g" \
+	-e "s/\(V4L2_PIX_FMT_[A-Z0-9_]\+\)\(\s\+v4l2_fourcc\)/<link linkend=\"\1\">\1<\/link>\2/g" \
 	-e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \
 	-e "s/v4l2\-mpeg\-vbi\-ITV0/v4l2-mpeg-vbi-itv0-1/g"
 

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 24c22ca..948ddaa 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -555,10 +555,46 @@ typedef enum fe_delivery_system {
 		</section>
 		<section id="DTV-ISDBT-LAYER-TIME-INTERLEAVING">
 			<title><constant>DTV_ISDBT_LAYER*_TIME_INTERLEAVING</constant></title>
-			<para>Possible values: 0, 1, 2, 3, -1 (AUTO)</para>
-			<para>Note: The real inter-leaver depth-names depend on the mode (fft-size); the values
-				here are referring to what can be found in the TMCC-structure -
-				independent of the mode.</para>
+			<para>Valid values: 0, 1, 2, 4, -1 (AUTO)</para>
+			<para>when DTV_ISDBT_SOUND_BROADCASTING is active, value 8 is also valid.</para>
+			<para>Note: The real time interleaving length depends on the mode (fft-size). The values
+				here are referring to what can be found in the TMCC-structure, as shown in the table below.</para>
+			<informaltable id="isdbt-layer-interleaving-table">
+				<tgroup cols="4" align="center">
+					<tbody>
+						<row>
+							<entry>DTV_ISDBT_LAYER*_TIME_INTERLEAVING</entry>
+							<entry>Mode 1 (2K FFT)</entry>
+							<entry>Mode 2 (4K FFT)</entry>
+							<entry>Mode 3 (8K FFT)</entry>
+						</row>
+						<row>
+							<entry>0</entry>
+							<entry>0</entry>
+							<entry>0</entry>
+							<entry>0</entry>
+						</row>
+						<row>
+							<entry>1</entry>
+							<entry>4</entry>
+							<entry>2</entry>
+							<entry>1</entry>
+						</row>
+						<row>
+							<entry>2</entry>
+							<entry>8</entry>
+							<entry>4</entry>
+							<entry>2</entry>
+						</row>
+						<row>
+							<entry>4</entry>
+							<entry>16</entry>
+							<entry>8</entry>
+							<entry>4</entry>
+						</row>
+					</tbody>
+				</tgroup>
+			</informaltable>
 		</section>
 		<section id="DTV-ATSCMH-FIC-VER">
 			<title><constant>DTV_ATSCMH_FIC_VER</constant></title>

Documentation/DocBook/media/v4l/controls.xml

View file

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 47198ee..9f5ffd8 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -13,6 +13,19 @@ correctly with any device.</para>
     <para>All controls are accessed using an ID value. V4L2 defines
 several IDs for specific purposes. Drivers can also implement their
 own custom controls using <constant>V4L2_CID_PRIVATE_BASE</constant>
+<footnote><para>The use of <constant>V4L2_CID_PRIVATE_BASE</constant>
+is problematic because different drivers may use the same
+<constant>V4L2_CID_PRIVATE_BASE</constant> ID for different controls.
+This makes it hard to programatically set such controls since the meaning
+of the control with that ID is driver dependent. In order to resolve this
+drivers use unique IDs and the <constant>V4L2_CID_PRIVATE_BASE</constant>
+IDs are mapped to those unique IDs by the kernel. Consider these
+<constant>V4L2_CID_PRIVATE_BASE</constant> IDs as aliases to the real
+IDs.</para>
+<para>Many applications today still use the <constant>V4L2_CID_PRIVATE_BASE</constant>
+IDs instead of using &VIDIOC-QUERYCTRL; with the <constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant>
+flag to enumerate all IDs, so support for <constant>V4L2_CID_PRIVATE_BASE</constant>
+is still around.</para></footnote>
 and higher values. The pre-defined control IDs have the prefix
 <constant>V4L2_CID_</constant>, and are listed in <xref
 linkend="control-id" />. The ID is used when querying the attributes of
@@ -31,25 +44,22 @@ the current video input or output, tuner or modulator, or audio input
 or output. Different in the sense of other bounds, another default and
 current value, step size or other menu items. A control with a certain
 <emphasis>custom</emphasis> ID can also change name and
-type.<footnote>
-	<para>It will be more convenient for applications if drivers
-make use of the <constant>V4L2_CTRL_FLAG_DISABLED</constant> flag, but
-that was never required.</para>
-      </footnote> Control values are stored globally, they do not
+type.</para>
+
+    <para>If a control is not applicable to the current configuration
+of the device (for example, it doesn't apply to the current video input)
+drivers set the <constant>V4L2_CTRL_FLAG_INACTIVE</constant> flag.</para>
+
+    <para>Control values are stored globally, they do not
 change when switching except to stay within the reported bounds. They
 also do not change &eg; when the device is opened or closed, when the
 tuner radio frequency is changed or generally never without
-application request. Since V4L2 specifies no event mechanism, panel
-applications intended to cooperate with other panel applications (be
-they built into a larger application, as a TV viewer) may need to
-regularly poll control values to update their user
-interface.<footnote>
-	<para>Applications could call an ioctl to request events.
-After another process called &VIDIOC-S-CTRL; or another ioctl changing
-shared properties the &func-select; function would indicate
-readability until any ioctl (querying the properties) is
-called.</para>
-      </footnote></para>
+application request.</para>
+
+    <para>V4L2 specifies an event mechanism to notify applications
+when controls change value (see &VIDIOC-SUBSCRIBE-EVENT;, event
+<constant>V4L2_EVENT_CTRL</constant>), panel applications might want to make
+use of that in order to always reflect the correct control value.</para>
 
     <para>
       All controls use machine endianness.
@@ -398,14 +408,17 @@ to work.</entry>
 	  <row id="v4l2-alpha-component">
 	    <entry><constant>V4L2_CID_ALPHA_COMPONENT</constant></entry>
 	    <entry>integer</entry>
-	    <entry> Sets the alpha color component on the capture device or on
-	    the capture buffer queue of a mem-to-mem device. When a mem-to-mem
-	    device produces frame format that includes an alpha component
+	    <entry>Sets the alpha color component. When a capture device (or
+	    capture queue of a mem-to-mem device) produces a frame format that
+	    includes an alpha component
 	    (e.g. <link linkend="rgb-formats">packed RGB image formats</link>)
-	    and the alpha value is not defined by the mem-to-mem input data
-	    this control lets you select the alpha component value of all
-	    pixels. It is applicable to any pixel format that contains an alpha
-	    component.
+	    and the alpha value is not defined by the device or the mem-to-mem
+	    input data this control lets you select the alpha component value of
+	    all pixels. When an output device (or output queue of a mem-to-mem
+	    device) consumes a frame format that doesn't include an alpha
+	    component and the device supports alpha channel processing this
+	    control lets you set the alpha component value of all pixels for
+	    further processing in the device.
 	    </entry>
 	  </row>
 	  <row>
@@ -434,127 +447,152 @@ Drivers must implement <constant>VIDIOC_QUERYCTRL</constant>,
 controls, <constant>VIDIOC_QUERYMENU</constant> when it has one or
 more menu type controls.</para>
 
-    <example>
-      <title>Enumerating all controls</title>
+    <example id="enum_all_controls">
+      <title>Enumerating all user controls</title>
 
       <programlisting>
 &v4l2-queryctrl; queryctrl;
 &v4l2-querymenu; querymenu;
 
-static void
-enumerate_menu (void)
+static void enumerate_menu(void)
 {
-	printf ("  Menu items:\n");
+	printf("  Menu items:\n");
 
-	memset (&amp;querymenu, 0, sizeof (querymenu));
+	memset(&amp;querymenu, 0, sizeof(querymenu));
 	querymenu.id = queryctrl.id;
 
 	for (querymenu.index = queryctrl.minimum;
 	     querymenu.index &lt;= queryctrl.maximum;
-	      querymenu.index++) {
-		if (0 == ioctl (fd, &VIDIOC-QUERYMENU;, &amp;querymenu)) {
-			printf ("  %s\n", querymenu.name);
+	     querymenu.index++) {
+		if (0 == ioctl(fd, &VIDIOC-QUERYMENU;, &amp;querymenu)) {
+			printf("  %s\n", querymenu.name);
 		}
 	}
 }
 
-memset (&amp;queryctrl, 0, sizeof (queryctrl));
+memset(&amp;queryctrl, 0, sizeof(queryctrl));
 
 for (queryctrl.id = V4L2_CID_BASE;
      queryctrl.id &lt; V4L2_CID_LASTP1;
      queryctrl.id++) {
-	if (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+	if (0 == ioctl(fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
 		if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)
 			continue;
 
-		printf ("Control %s\n", queryctrl.name);
+		printf("Control %s\n", queryctrl.name);
 
 		if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
-			enumerate_menu ();
+			enumerate_menu();
 	} else {
 		if (errno == EINVAL)
 			continue;
 
-		perror ("VIDIOC_QUERYCTRL");
-		exit (EXIT_FAILURE);
+		perror("VIDIOC_QUERYCTRL");
+		exit(EXIT_FAILURE);
 	}
 }
 
 for (queryctrl.id = V4L2_CID_PRIVATE_BASE;;
      queryctrl.id++) {
-	if (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+	if (0 == ioctl(fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
 		if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)
 			continue;
 
-		printf ("Control %s\n", queryctrl.name);
+		printf("Control %s\n", queryctrl.name);
 
 		if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
-			enumerate_menu ();
+			enumerate_menu();
 	} else {
 		if (errno == EINVAL)
 			break;
 
-		perror ("VIDIOC_QUERYCTRL");
-		exit (EXIT_FAILURE);
+		perror("VIDIOC_QUERYCTRL");
+		exit(EXIT_FAILURE);
 	}
 }
 </programlisting>
     </example>
 
     <example>
+      <title>Enumerating all user controls (alternative)</title>
+	<programlisting>
+memset(&amp;queryctrl, 0, sizeof(queryctrl));
+
+queryctrl.id = V4L2_CTRL_CLASS_USER | V4L2_CTRL_FLAG_NEXT_CTRL;
+while (0 == ioctl(fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+	if (V4L2_CTRL_ID2CLASS(queryctrl.id) != V4L2_CTRL_CLASS_USER)
+		break;
+	if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)
+		continue;
+
+	printf("Control %s\n", queryctrl.name);
+
+	if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
+		enumerate_menu();
+
+	queryctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
+}
+if (errno != EINVAL) {
+	perror("VIDIOC_QUERYCTRL");
+	exit(EXIT_FAILURE);
+}
+</programlisting>
+    </example>
+
+    <example>
       <title>Changing controls</title>
 
       <programlisting>
 &v4l2-queryctrl; queryctrl;
 &v4l2-control; control;
 
-memset (&amp;queryctrl, 0, sizeof (queryctrl));
+memset(&amp;queryctrl, 0, sizeof(queryctrl));
 queryctrl.id = V4L2_CID_BRIGHTNESS;
 
-if (-1 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+if (-1 == ioctl(fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
 	if (errno != EINVAL) {
-		perror ("VIDIOC_QUERYCTRL");
-		exit (EXIT_FAILURE);
+		perror("VIDIOC_QUERYCTRL");
+		exit(EXIT_FAILURE);
 	} else {
-		printf ("V4L2_CID_BRIGHTNESS is not supported\n");
+		printf("V4L2_CID_BRIGHTNESS is not supported\n");
 	}
 } else if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED) {
-	printf ("V4L2_CID_BRIGHTNESS is not supported\n");
+	printf("V4L2_CID_BRIGHTNESS is not supported\n");
 } else {
-	memset (&amp;control, 0, sizeof (control));
+	memset(&amp;control, 0, sizeof (control));
 	control.id = V4L2_CID_BRIGHTNESS;
 	control.value = queryctrl.default_value;
 
-	if (-1 == ioctl (fd, &VIDIOC-S-CTRL;, &amp;control)) {
-		perror ("VIDIOC_S_CTRL");
-		exit (EXIT_FAILURE);
+	if (-1 == ioctl(fd, &VIDIOC-S-CTRL;, &amp;control)) {
+		perror("VIDIOC_S_CTRL");
+		exit(EXIT_FAILURE);
 	}
 }
 
-memset (&amp;control, 0, sizeof (control));
+memset(&amp;control, 0, sizeof(control));
 control.id = V4L2_CID_CONTRAST;
 
-if (0 == ioctl (fd, &VIDIOC-G-CTRL;, &amp;control)) {
+if (0 == ioctl(fd, &VIDIOC-G-CTRL;, &amp;control)) {
 	control.value += 1;
 
 	/* The driver may clamp the value or return ERANGE, ignored here */
 
-	if (-1 == ioctl (fd, &VIDIOC-S-CTRL;, &amp;control)
+	if (-1 == ioctl(fd, &VIDIOC-S-CTRL;, &amp;control)
 	    &amp;&amp; errno != ERANGE) {
-		perror ("VIDIOC_S_CTRL");
-		exit (EXIT_FAILURE);
+		perror("VIDIOC_S_CTRL");
+		exit(EXIT_FAILURE);
 	}
 /* Ignore if V4L2_CID_CONTRAST is unsupported */
 } else if (errno != EINVAL) {
-	perror ("VIDIOC_G_CTRL");
-	exit (EXIT_FAILURE);
+	perror("VIDIOC_G_CTRL");
+	exit(EXIT_FAILURE);
 }
 
 control.id = V4L2_CID_AUDIO_MUTE;
-control.value = TRUE; /* silence */
+control.value = 1; /* silence */
 
 /* Errors ignored */
-ioctl (fd, VIDIOC_S_CTRL, &amp;control);
+ioctl(fd, VIDIOC_S_CTRL, &amp;control);
 </programlisting>
     </example>
   </section>
@@ -625,16 +663,29 @@ supported.</para>
 &v4l2-control;, except for the fact that it also allows for 64-bit
 values and pointers to be passed.</para>
 
+      <para>Since the &v4l2-ext-control; supports pointers it is now
+also possible to have controls with compound types such as N-dimensional arrays
+and/or structures. You need to specify the <constant>V4L2_CTRL_FLAG_NEXT_COMPOUND</constant>
+when enumerating controls to actually be able to see such compound controls.
+In other words, these controls with compound types should only be used
+programmatically.</para>
+
+      <para>Since such compound controls need to expose more information
+about themselves than is possible with &VIDIOC-QUERYCTRL; the
+&VIDIOC-QUERY-EXT-CTRL; ioctl was added. In particular, this ioctl gives
+the dimensions of the N-dimensional array if this control consists of more than
+one element.</para>
+
       <para>It is important to realize that due to the flexibility of
 controls it is necessary to check whether the control you want to set
 actually is supported in the driver and what the valid range of values
-is. So use the &VIDIOC-QUERYCTRL; and &VIDIOC-QUERYMENU; ioctls to
-check this. Also note that it is possible that some of the menu
-indices in a control of type <constant>V4L2_CTRL_TYPE_MENU</constant>
-may not be supported (<constant>VIDIOC_QUERYMENU</constant> will
-return an error). A good example is the list of supported MPEG audio
-bitrates. Some drivers only support one or two bitrates, others
-support a wider range.</para>
+is. So use the &VIDIOC-QUERYCTRL; (or &VIDIOC-QUERY-EXT-CTRL;) and
+&VIDIOC-QUERYMENU; ioctls to check this. Also note that it is possible
+that some of the menu indices in a control of type
+<constant>V4L2_CTRL_TYPE_MENU</constant> may not be supported
+(<constant>VIDIOC_QUERYMENU</constant> will return an error). A good
+example is the list of supported MPEG audio bitrates. Some drivers only
+support one or two bitrates, others support a wider range.</para>
 
       <para>
 	All controls use machine endianness.
@@ -675,12 +726,12 @@ control class is found:</para>
       <informalexample>
 	<programlisting>
 qctrl.id = V4L2_CTRL_CLASS_MPEG | V4L2_CTRL_FLAG_NEXT_CTRL;
-while (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;qctrl)) {
-	if (V4L2_CTRL_ID2CLASS (qctrl.id) != V4L2_CTRL_CLASS_MPEG)
+while (0 == ioctl(fd, &VIDIOC-QUERYCTRL;, &amp;qctrl)) {
+	if (V4L2_CTRL_ID2CLASS(qctrl.id) != V4L2_CTRL_CLASS_MPEG)
 		break;
 		/* ... */
-		qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
-	}
+	qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
+}
 </programlisting>
       </informalexample>
 
@@ -700,7 +751,7 @@ ID based on a control ID.</para>
 <constant>VIDIOC_QUERYCTRL</constant> will fail when used in
 combination with <constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant>. In
 that case the old method of enumerating control should be used (see
-1.8). But if it is supported, then it is guaranteed to enumerate over
+<xref linkend="enum_all_controls" />). But if it is supported, then it is guaranteed to enumerate over
 all controls, including driver-private controls.</para>
     </section>
 
@@ -4000,6 +4051,68 @@ to find receivers which can scroll strings sized as 32 x N or 64 x N characters.
 with steps of 32 or 64 characters. The result is it must always contain a string with size multiple of 32 or 64. </entry>
 	  </row>
 	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_MONO_STEREO</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">Sets the Mono/Stereo bit of the Decoder Identification code. If set,
+then the audio was recorded as stereo.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_ARTIFICIAL_HEAD</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">Sets the
+<ulink url="http://en.wikipedia.org/wiki/Artificial_head">Artificial Head</ulink> bit of the Decoder
+Identification code. If set, then the audio was recorded using an artificial head.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_COMPRESSED</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">Sets the Compressed bit of the Decoder Identification code. If set,
+then the audio is compressed.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_DYNAMIC_PTY</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">Sets the Dynamic PTY bit of the Decoder Identification code. If set,
+then the PTY code is dynamically switched.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then a traffic announcement is in progress.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_TRAFFIC_PROGRAM</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then the tuned programme carries traffic announcements.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_MUSIC_SPEECH</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then this channel broadcasts music. If cleared, then it
+broadcasts speech. If the transmitter doesn't make this distinction, then it should be set.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_ALT_FREQS_ENABLE</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then transmit alternate frequencies.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_TX_ALT_FREQS</constant>&nbsp;</entry>
+	    <entry>__u32 array</entry>
+	  </row>
+	  <row><entry spanname="descr">The alternate frequencies in kHz units. The RDS standard allows
+for up to 25 frequencies to be defined. Drivers may support fewer frequencies so check
+the array size.</entry>
+	  </row>
+	  <row>
 	    <entry spanname="id"><constant>V4L2_CID_AUDIO_LIMITER_ENABLED</constant>&nbsp;</entry>
 	    <entry>boolean</entry>
 	  </row>
@@ -4976,6 +5089,57 @@ description of this control class.</entry>
           </row><row><entry spanname="descr">Enables/disables RDS
 	  reception by the radio tuner</entry>
           </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_PTY</constant>&nbsp;</entry>
+	    <entry>integer</entry>
+	  </row>
+	  <row><entry spanname="descr">Gets RDS Programme Type field.
+This encodes up to 31 pre-defined programme types.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_PS_NAME</constant>&nbsp;</entry>
+	    <entry>string</entry>
+	  </row>
+	  <row><entry spanname="descr">Gets the Programme Service name (PS_NAME).
+It is intended for static display on a receiver. It is the primary aid to listeners in programme service
+identification and selection.  In Annex E of <xref linkend="iec62106" />, the RDS specification,
+there is a full description of the correct character encoding for Programme Service name strings.
+Also from RDS specification, PS is usually a single eight character text. However, it is also possible
+to find receivers which can scroll strings sized as 8 x N characters. So, this control must be configured
+with steps of 8 characters. The result is it must always contain a string with size multiple of 8.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_RADIO_TEXT</constant>&nbsp;</entry>
+	    <entry>string</entry>
+	  </row>
+	  <row><entry spanname="descr">Gets the Radio Text info. It is a textual description of
+what is being broadcasted. RDS Radio Text can be applied when broadcaster wishes to transmit longer PS names,
+programme-related information or any other text. In these cases, RadioText can be used in addition to
+<constant>V4L2_CID_RDS_RX_PS_NAME</constant>. The encoding for Radio Text strings is also fully described
+in Annex E of <xref linkend="iec62106" />. The length of Radio Text strings depends on which RDS Block is being
+used to transmit it, either 32 (2A block) or 64 (2B block).  However, it is also possible
+to find receivers which can scroll strings sized as 32 x N or 64 x N characters. So, this control must be configured
+with steps of 32 or 64 characters. The result is it must always contain a string with size multiple of 32 or 64. </entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then a traffic announcement is in progress.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_TRAFFIC_PROGRAM</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then the tuned programme carries traffic announcements.</entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_RDS_RX_MUSIC_SPEECH</constant>&nbsp;</entry>
+	    <entry>boolean</entry>
+	  </row>
+	  <row><entry spanname="descr">If set, then this channel broadcasts music. If cleared, then it
+broadcasts speech. If the transmitter doesn't make this distinction, then it will be set.</entry>
+	  </row>
           <row>
 	    <entry spanname="id"><constant>V4L2_CID_TUNE_DEEMPHASIS</constant>&nbsp;</entry>
 	    <entry>enum v4l2_deemphasis</entry>
@@ -5007,6 +5171,102 @@ defines possible values for de-emphasis. Here they are:</entry>
         </tbody>
       </tgroup>
       </table>
+    </section>
+
+    <section id="detect-controls">
+      <title>Detect Control Reference</title>
+
+      <para>The Detect class includes controls for common features of
+      various motion or object detection capable devices.</para>
+
+      <table pgwide="1" frame="none" id="detect-control-id">
+      <title>Detect Control IDs</title>
+
+      <tgroup cols="4">
+        <colspec colname="c1" colwidth="1*" />
+        <colspec colname="c2" colwidth="6*" />
+        <colspec colname="c3" colwidth="2*" />
+        <colspec colname="c4" colwidth="6*" />
+        <spanspec namest="c1" nameend="c2" spanname="id" />
+        <spanspec namest="c2" nameend="c4" spanname="descr" />
+        <thead>
+          <row>
+            <entry spanname="id" align="left">ID</entry>
+            <entry align="left">Type</entry>
+          </row><row rowsep="1"><entry spanname="descr" align="left">Description</entry>
+          </row>
+        </thead>
+        <tbody valign="top">
+          <row><entry></entry></row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_DETECT_CLASS</constant>&nbsp;</entry>
+            <entry>class</entry>
+          </row><row><entry spanname="descr">The Detect class
+descriptor. Calling &VIDIOC-QUERYCTRL; for this control will return a
+description of this control class.</entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_DETECT_MD_MODE</constant>&nbsp;</entry>
+            <entry>menu</entry>
+          </row><row><entry spanname="descr">Sets the motion detection mode.</entry>
+          </row>
+	  <row>
+	    <entrytbl spanname="descr" cols="2">
+	      <tbody valign="top">
+		<row>
+		  <entry><constant>V4L2_DETECT_MD_MODE_DISABLED</constant>
+		  </entry><entry>Disable motion detection.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_DETECT_MD_MODE_GLOBAL</constant>
+		  </entry><entry>Use a single motion detection threshold.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_DETECT_MD_MODE_THRESHOLD_GRID</constant>
+		  </entry><entry>The image is divided into a grid, each cell with its own
+		  motion detection threshold. These thresholds are set through the
+		  <constant>V4L2_CID_DETECT_MD_THRESHOLD_GRID</constant> matrix control.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_DETECT_MD_MODE_REGION_GRID</constant>