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

ab11ca34 · Linus Torvalds <[email protected]> · 2012-05-24 10:21:51 -07:00

Pull media updates from Mauro Carvalho Chehab:
 - some V4L2 API updates needed by embedded devices
 - DVB API extensions for ATSC-MH delivery system, used in US for mobile
   TV
 - new tuners for fc0011/0012/0013 and tua9001
 - a new dvb driver for af9033/9035
 - a new ATSC-MH frontend (lg2160)
 - new remote controller keymaps
 - Removal of a few legacy webcam driver that got replaced by gspca on
   several kernel versions ago
 - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
 - a new webcam sensor driver (smiapp)
 - a new video input driver for embedded (sta2x1xx)
 - several improvements, fixes, cleanups, etc inside the drivers.

Manually fix up conflicts due to err() -> dev_err() conversion in
drivers/staging/media/easycap/easycap_main.c

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
  [media] saa7134-cards: Remove a PCI entry added by mistake
  [media] radio-sf16fmi: add support for SF16-FMD
  [media] rc-loopback: remove duplicate line
  [media] patch for Asus My Cinema PS3-100 (1043:48cd)
  [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
  [media] em28xx: simple comment fix
  [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
  [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
  [media] smiapp: Add support for 8-bit uncompressed formats
  [media] smiapp: Allow generic quirk registers
  [media] smiapp: Use non-binning limits if the binning limit is zero
  [media] smiapp: Initialise rval in smiapp_read_nvm()
  [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
  [media] smiapp: Use 8-bit reads only before identifying the sensor
  [media] smiapp: Quirk for sensors that only do 8-bit reads
  [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
  [media] smiapp: Allow using external clock from the clock framework
  [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
  [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
  [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
  ...

Commit: ab11ca34eea8fda7a1a9302d86f6ef6108ffd68f
Parents: f9369910 · 71006fb2

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

Changes

463 files changed · +39194 −16776

File	Status	Add	Del	Content
Documentation/DocBook/media/Makefile	modified	+3	−1	View file
Documentation/DocBook/media/dvb/dvbproperty.xml	modified	+160	−0	View file
Documentation/DocBook/media/v4l/biblio.xml	modified	+29	−0	View file
Documentation/DocBook/media/v4l/common.xml	modified	+23	−15	View file
Documentation/DocBook/media/v4l/compat.xml	modified	+75	−0	View file
Documentation/DocBook/media/v4l/controls.xml	modified	+689	−19	View file
Documentation/DocBook/media/v4l/dev-subdev.xml	modified	+178	−24	View file
Documentation/DocBook/media/v4l/io.xml	modified	+7	−5	View file
Documentation/DocBook/media/v4l/pixfmt-srggb10.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml	added	+29	−0	View file
Documentation/DocBook/media/v4l/pixfmt.xml	modified	+1	−5	View file
Documentation/DocBook/media/v4l/subdev-image-processing-crop.dia	added	+614	−0	View file
Documentation/DocBook/media/v4l/subdev-image-processing-crop.svg	added	+63	−0	View file
Documentation/DocBook/media/v4l/subdev-image-processing-full.dia	added	+1588	−0	View file
Documentation/DocBook/media/v4l/subdev-image-processing-full.svg	added	+163	−0	View file
Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.dia	added	+1152	−0	View file
Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.svg	added	+116	−0	View file
Documentation/DocBook/media/v4l/v4l2.xml	modified	+41	−3	View file
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml	modified	+12	−4	View file
Documentation/DocBook/media/v4l/vidioc-cropcap.xml	modified	+2	−2	View file
Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml	added	+211	−0	View file
Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml	modified	+4	−0	View file
Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml	added	+119	−0	View file
Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml	modified	+2	−2	View file
Documentation/DocBook/media/v4l/vidioc-enuminput.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-enumoutput.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-g-crop.xml	modified	+2	−2	View file
Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml	modified	+6	−0	View file
Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml	modified	+119	−11	View file
Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml	modified	+26	−0	View file
Documentation/DocBook/media/v4l/vidioc-g-fmt.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-g-frequency.xml	modified	+3	−3	View file
Documentation/DocBook/media/v4l/vidioc-g-parm.xml	modified	+3	−2	View file
Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-g-tuner.xml	modified	+1	−1	View file
Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml	modified	+6	−0	View file
Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml	modified	+4	−0	View file
Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml	added	+104	−0	View file
Documentation/DocBook/media/v4l/vidioc-queryctrl.xml	modified	+38	−3	View file
Documentation/DocBook/media/v4l/vidioc-reqbufs.xml	modified	+4	−3	View file
Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml	modified	+3	−2	View file
Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml	modified	+6	−3	View file
Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml	added	+228	−0	View file
Documentation/dvb/get_dvb_firmware	modified	+19	−1	View file
Documentation/feature-removal-schedule.txt	modified	+9	−0	View file
Documentation/media-framework.txt	modified	+19	−0	View file
Documentation/video4linux/4CCs.txt	added	+32	−0	View file
Documentation/video4linux/gspca.txt	modified	+1	−0	View file
Documentation/video4linux/v4l2-controls.txt	modified	+21	−0	View file
Documentation/video4linux/v4l2-framework.txt	modified	+88	−18	View file
MAINTAINERS	modified	+8	−1	View file
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	modified	+1	−1	View file
arch/arm/plat-mxc/include/mach/mx2_cam.h	modified	+0	−2	View file
drivers/input/ff-memless.c	modified	+1	−2	View file
drivers/media/common/saa7146_fops.c	modified	+105	−21	View file
drivers/media/common/saa7146_hlp.c	modified	+12	−11	View file
drivers/media/common/saa7146_vbi.c	modified	+20	−34	View file
drivers/media/common/saa7146_video.c	modified	+132	−235	View file
drivers/media/common/tuners/Kconfig	modified	+27	−0	View file
drivers/media/common/tuners/Makefile	modified	+4	−0	View file
drivers/media/common/tuners/fc0011.c	added	+524	−0	View file
drivers/media/common/tuners/fc0011.h	added	+41	−0	View file
drivers/media/common/tuners/fc0012-priv.h	added	+43	−0	View file
drivers/media/common/tuners/fc0012.c	added	+467	−0	View file
drivers/media/common/tuners/fc0012.h	added	+44	−0	View file
drivers/media/common/tuners/fc0013-priv.h	added	+44	−0	View file
drivers/media/common/tuners/fc0013.c	added	+634	−0	View file
drivers/media/common/tuners/fc0013.h	added	+57	−0	View file
drivers/media/common/tuners/fc001x-common.h	added	+39	−0	View file
drivers/media/common/tuners/tua9001.c	added	+215	−0	View file
drivers/media/common/tuners/tua9001.h	added	+46	−0	View file
drivers/media/common/tuners/tua9001_priv.h	added	+34	−0	View file
drivers/media/common/tuners/xc5000.c	modified	+5	−2	View file
drivers/media/common/tuners/xc5000.h	modified	+1	−1	View file
drivers/media/dvb/bt8xx/dst_ca.c	modified	+0	−2	View file
drivers/media/dvb/ddbridge/ddbridge-core.c	modified	+1	−2	View file
drivers/media/dvb/dvb-core/dvb_demux.c	modified	+10	−0	View file
drivers/media/dvb/dvb-core/dvb_demux.h	modified	+2	−0	View file
drivers/media/dvb/dvb-core/dvb_frontend.c	modified	+79	−1	View file
drivers/media/dvb/dvb-core/dvb_frontend.h	modified	+18	−0	View file
drivers/media/dvb/dvb-usb/Kconfig	modified	+13	−0	View file
drivers/media/dvb/dvb-usb/Makefile	modified	+3	−0	View file
drivers/media/dvb/dvb-usb/af9015.c	modified	+212	−283	View file
drivers/media/dvb/dvb-usb/af9035.c	added	+1242	−0	View file
drivers/media/dvb/dvb-usb/af9035.h	added	+113	−0	View file
drivers/media/dvb/dvb-usb/dib0700_core.c	modified	+13	−11	View file
drivers/media/dvb/dvb-usb/dib0700_devices.c	modified	+6	−1	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+12	−0	View file
drivers/media/dvb/dvb-usb/dvb-usb-urb.c	modified	+12	−0	View file
drivers/media/dvb/dvb-usb/dvb-usb.h	modified	+2	−1	View file
drivers/media/dvb/dvb-usb/dw2102.c	modified	+36	−40	View file
drivers/media/dvb/dvb-usb/it913x.c	modified	+2	−2	View file
drivers/media/dvb/dvb-usb/lmedm04.c	modified	+2	−3	View file
drivers/media/dvb/dvb-usb/mxl111sf-tuner.c	modified	+1	−0	View file
drivers/media/dvb/dvb-usb/mxl111sf.c	modified	+824	−48	View file
drivers/media/dvb/dvb-usb/rtl28xxu.c	modified	+28	−0	View file
drivers/media/dvb/frontends/Kconfig	modified	+31	−4	View file
drivers/media/dvb/frontends/Makefile	modified	+5	−2	View file
drivers/media/dvb/frontends/af9013.c	modified	+5	−8	View file
drivers/media/dvb/frontends/af9033.c	added	+980	−0	View file
drivers/media/dvb/frontends/af9033.h	added	+75	−0	View file
drivers/media/dvb/frontends/af9033_priv.h	added	+470	−0	View file
drivers/media/dvb/frontends/au8522_common.c	added	+259	−0	View file
drivers/media/dvb/frontends/au8522_dig.c	modified	+0	−215	View file
drivers/media/dvb/frontends/au8522_priv.h	modified	+2	−0	View file
drivers/media/dvb/frontends/cx24110.c	modified	+3	−4	View file
drivers/media/dvb/frontends/cxd2820r_core.c	modified	+2	−2	View file
drivers/media/dvb/frontends/dib7000p.c	modified	+0	−5	View file
drivers/media/dvb/frontends/dib9000.c	modified	+59	−72	View file
drivers/media/dvb/frontends/drxd.h	modified	+14	−0	View file
drivers/media/dvb/frontends/drxk_hard.c	modified	+12	−6	View file
drivers/media/dvb/frontends/drxk_map.h	modified	+2	−0	View file
drivers/media/dvb/frontends/ds3000.c	modified	+4	−1	View file
drivers/media/dvb/frontends/it913x-fe.c	modified	+12	−14	View file
drivers/media/dvb/frontends/lg2160.c	added	+1468	−0	View file
drivers/media/dvb/frontends/lg2160.h	added	+84	−0	View file
drivers/media/dvb/frontends/lgs8gxx.c	modified	+1	−2	View file
drivers/media/dvb/frontends/m88rs2000.c	modified	+22	−7	View file
drivers/media/dvb/frontends/rtl2830.c	modified	+198	−3	View file
drivers/media/dvb/frontends/rtl2830_priv.h	modified	+1	−0	View file
drivers/media/dvb/frontends/stb0899_drv.c	modified	+1	−7	View file
drivers/media/dvb/frontends/stb6100.c	modified	+1	−2	View file
drivers/media/dvb/frontends/stv0297.c	modified	+0	−2	View file
drivers/media/dvb/frontends/stv0900_sw.c	modified	+0	−2	View file
drivers/media/dvb/frontends/stv090x.c	modified	+0	−2	View file
drivers/media/dvb/frontends/zl10353.c	modified	+2	−3	View file
drivers/media/dvb/mantis/hopper_cards.c	modified	+1	−2	View file
drivers/media/dvb/mantis/mantis_cards.c	modified	+1	−2	View file
drivers/media/dvb/mantis/mantis_dma.c	modified	+0	−4	View file
drivers/media/dvb/mantis/mantis_evm.c	modified	+1	−2	View file
drivers/media/dvb/ngene/ngene-core.c	modified	+1	−3	View file
drivers/media/dvb/pluto2/pluto2.c	modified	+0	−8	View file
drivers/media/dvb/siano/smssdio.c	modified	+2	−2	View file
drivers/media/dvb/siano/smsusb.c	modified	+2	−0	View file
drivers/media/dvb/ttpci/av7110_v4l.c	modified	+52	−20	View file
drivers/media/dvb/ttpci/budget-av.c	modified	+3	−3	View file
drivers/media/media-entity.c	modified	+55	−2	View file
drivers/media/radio/Kconfig	modified	+2	−2	View file
drivers/media/radio/dsbr100.c	modified	+165	−363	View file
drivers/media/radio/radio-gemtek.c	modified	+25	−0	View file
drivers/media/radio/radio-isa.c	modified	+112	−61	View file
drivers/media/radio/radio-isa.h	modified	+9	−0	View file
drivers/media/radio/radio-keene.c	modified	+21	−15	View file
drivers/media/radio/radio-mr800.c	modified	+234	−290	View file
drivers/media/radio/radio-rtrack2.c	modified	+1	−0	View file
drivers/media/radio/radio-sf16fmi.c	modified	+9	−5	View file
drivers/media/radio/radio-sf16fmr2.c	modified	+113	−31	View file
drivers/media/radio/radio-timb.c	modified	+1	−1	View file
drivers/media/radio/saa7706h.c	modified	+1	−1	View file
drivers/media/radio/si470x/radio-si470x-common.c	modified	+62	−243	View file
drivers/media/radio/si470x/radio-si470x-i2c.c	modified	+17	−48	View file
drivers/media/radio/si470x/radio-si470x-usb.c	modified	+113	−152	View file
drivers/media/radio/si470x/radio-si470x.h	modified	+7	−7	View file
drivers/media/radio/tef6862.c	modified	+1	−1	View file
drivers/media/radio/wl128x/fmdrv_v4l2.c	modified	+4	−0	View file
drivers/media/rc/Kconfig	modified	+1	−0	View file
drivers/media/rc/ati_remote.c	modified	+109	−37	View file
drivers/media/rc/fintek-cir.c	modified	+6	−7	View file
drivers/media/rc/imon.c	modified	+1	−1	View file
drivers/media/rc/ir-raw.c	modified	+3	−5	View file
drivers/media/rc/ir-sanyo-decoder.c	modified	+2	−2	View file
drivers/media/rc/ite-cir.c	modified	+6	−8	View file
drivers/media/rc/keymaps/Makefile	modified	+3	−0	View file
drivers/media/rc/keymaps/rc-asus-ps3-100.c	added	+91	−0	View file
drivers/media/rc/keymaps/rc-it913x-v2.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-medion-x10-digitainer.c	added	+123	−0	View file
drivers/media/rc/keymaps/rc-medion-x10-or2x.c	added	+108	−0	View file
drivers/media/rc/mceusb.c	modified	+2	−3	View file
drivers/media/rc/nuvoton-cir.c	modified	+12	−14	View file
drivers/media/rc/rc-loopback.c	modified	+0	−1	View file
drivers/media/rc/redrat3.c	modified	+1	−1	View file
drivers/media/video/Kconfig	modified	+21	−27	View file
drivers/media/video/Makefile	modified	+4	−1	View file
drivers/media/video/adp1653.c	modified	+4	−5	View file
drivers/media/video/adv7180.c	modified	+350	−67	View file
drivers/media/video/adv7343.c	modified	+1	−3	View file
drivers/media/video/aptina-pll.c	modified	+2	−3	View file
drivers/media/video/arv.c	modified	+6	−1	View file
drivers/media/video/as3645a.c	modified	+5	−5	View file
drivers/media/video/atmel-isi.c	modified	+4	−14	View file
drivers/media/video/au0828/Kconfig	modified	+2	−1	View file
drivers/media/video/au0828/au0828-cards.c	modified	+2	−0	View file
drivers/media/video/au0828/au0828-dvb.c	modified	+23	−4	View file
drivers/media/video/au0828/au0828-video.c	modified	+15	−10	View file
drivers/media/video/blackfin/bfin_capture.c	modified	+4	−0	View file
drivers/media/video/bt8xx/bttv-driver.c	modified	+2	−2	View file
drivers/media/video/bw-qcam.c	modified	+62	−70	View file
drivers/media/video/c-qcam.c	modified	+66	−74	View file
drivers/media/video/cpia2/cpia2.h	modified	+16	−18	View file
drivers/media/video/cpia2/cpia2_core.c	modified	+31	−111	View file
drivers/media/video/cpia2/cpia2_usb.c	modified	+59	−19	View file
drivers/media/video/cpia2/cpia2_v4l.c	modified	+261	−589	View file
drivers/media/video/cpia2/cpia2dev.h	deleted	+0	−50	View before deletion
drivers/media/video/cx18/cx18-alsa-main.c	modified	+1	−0	View file
drivers/media/video/cx18/cx18-alsa-pcm.c	modified	+3	−7	View file
drivers/media/video/cx18/cx18-ioctl.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-mailbox.c	modified	+1	−5	View file
drivers/media/video/cx18/cx18-streams.c	modified	+0	−3	View file
drivers/media/video/cx231xx/cx231xx-417.c	modified	+11	−7	View file
drivers/media/video/cx231xx/cx231xx-audio.c	modified	+11	−7	View file
drivers/media/video/cx231xx/cx231xx-avcore.c	modified	+68	−80	View file
drivers/media/video/cx231xx/cx231xx-core.c	modified	+35	−41	View file
drivers/media/video/cx231xx/cx231xx-vbi.c	modified	+1	−5	View file
drivers/media/video/cx231xx/cx231xx-video.c	modified	+4	−16	View file
drivers/media/video/cx23885/cx23885-cards.c	modified	+9	−0	View file
drivers/media/video/cx23885/cx23885-core.c	modified	+7	−0	View file
drivers/media/video/cx23885/cx23885-dvb.c	modified	+7	−0	View file
drivers/media/video/cx23885/cx23885.h	modified	+1	−0	View file
drivers/media/video/cx23885/cx23888-ir.c	modified	+1	−3	View file
drivers/media/video/cx25821/cx25821-alsa.c	modified	+0	−2	View file
drivers/media/video/cx25821/cx25821-audio-upstream.c	modified	+1	−2	View file
drivers/media/video/cx25821/cx25821-core.c	modified	+2	−12	View file
drivers/media/video/cx25821/cx25821-i2c.c	modified	+1	−2	View file
drivers/media/video/cx25821/cx25821-medusa-video.c	modified	+5	−8	View file
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c	modified	+1	−2	View file
drivers/media/video/cx25821/cx25821-video-upstream.c	modified	+1	−2	View file
drivers/media/video/cx25821/cx25821-video.c	modified	+2	−23	View file
drivers/media/video/cx25821/cx25821-video.h	modified	+0	−2	View file
drivers/media/video/cx25840/cx25840-ir.c	modified	+1	−5	View file
drivers/media/video/davinci/Kconfig	modified	+1	−0	View file
drivers/media/video/davinci/vpbe_display.c	modified	+4	−0	View file
drivers/media/video/davinci/vpfe_capture.c	modified	+1	−1	View file
drivers/media/video/davinci/vpif_capture.c	modified	+4	−0	View file
drivers/media/video/davinci/vpif_display.c	modified	+4	−0	View file
drivers/media/video/em28xx/Kconfig	modified	+2	−2	View file
drivers/media/video/em28xx/Makefile	modified	+2	−3	View file
drivers/media/video/em28xx/em28xx-audio.c	modified	+7	−4	View file
drivers/media/video/em28xx/em28xx-cards.c	modified	+6	−75	View file
drivers/media/video/em28xx/em28xx-core.c	modified	+28	−2	View file
drivers/media/video/em28xx/em28xx-dvb.c	modified	+7	−4	View file
drivers/media/video/em28xx/em28xx-i2c.c	modified	+0	−3	View file
drivers/media/video/em28xx/em28xx-input.c	modified	+165	−85	View file
drivers/media/video/em28xx/em28xx-video.c	modified	+7	−6	View file
drivers/media/video/em28xx/em28xx.h	modified	+2	−58	View file
drivers/media/video/et61x251/Kconfig	deleted	+0	−18	View before deletion
drivers/media/video/et61x251/Makefile	deleted	+0	−4	View before deletion
drivers/media/video/et61x251/et61x251.h	deleted	+0	−213	View before deletion
drivers/media/video/et61x251/et61x251_core.c	deleted	+0	−2683	View before deletion
drivers/media/video/et61x251/et61x251_sensor.h	deleted	+0	−108	View before deletion
drivers/media/video/et61x251/et61x251_tas5130d1b.c	deleted	+0	−143	View before deletion
drivers/media/video/fsl-viu.c	modified	+4	−0	View file
drivers/media/video/gspca/Makefile	modified	+1	−1	View file
drivers/media/video/gspca/autogain_functions.c	added	+178	−0	View file
drivers/media/video/gspca/autogain_functions.h	modified	+5	−1	View file
drivers/media/video/gspca/conex.c	modified	+2	−2	View file
drivers/media/video/gspca/finepix.c	modified	+15	−3	View file
drivers/media/video/gspca/gl860/gl860.c	modified	+3	−0	View file
drivers/media/video/gspca/gspca.c	modified	+196	−349	View file
drivers/media/video/gspca/gspca.h	modified	+24	−2	View file
drivers/media/video/gspca/jl2005bcd.c	modified	+7	−3	View file
drivers/media/video/gspca/mars.c	modified	+126	−166	View file
drivers/media/video/gspca/nw80x.c	modified	+2	−0	View file
drivers/media/video/gspca/ov519.c	modified	+5	−5	View file
drivers/media/video/gspca/ov534.c	modified	+107	−39	View file
drivers/media/video/gspca/pac207.c	modified	+116	−220	View file
drivers/media/video/gspca/pac7302.c	modified	+109	−76	View file
drivers/media/video/gspca/pac7311.c	modified	+167	−338	View file
drivers/media/video/gspca/sn9c20x.c	modified	+276	−318	View file
drivers/media/video/gspca/sonixb.c	modified	+2	−0	View file
drivers/media/video/gspca/sonixj.c	modified	+1	−4	View file
drivers/media/video/gspca/sq905.c	modified	+8	−4	View file
drivers/media/video/gspca/sq905c.c	modified	+7	−3	View file
drivers/media/video/gspca/stv06xx/stv06xx.c	modified	+17	−4	View file
drivers/media/video/gspca/stv06xx/stv06xx.h	modified	+0	−3	View file
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c	modified	+35	−108	View file
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h	modified	+3	−4	View file
drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c	modified	+109	−250	View file
drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h	modified	+2	−10	View file
drivers/media/video/gspca/stv06xx/stv06xx_sensor.h	modified	+2	−2	View file
drivers/media/video/gspca/stv06xx/stv06xx_st6422.c	modified	+59	−177	View file
drivers/media/video/gspca/stv06xx/stv06xx_st6422.h	modified	+2	−2	View file
drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c	modified	+48	−150	View file
drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h	modified	+2	−6	View file
drivers/media/video/gspca/topro.c	modified	+2	−4	View file
drivers/media/video/gspca/vicam.c	modified	+10	−3	View file
drivers/media/video/gspca/zc3xx.c	modified	+229	−391	View file
drivers/media/video/hdpvr/hdpvr-control.c	modified	+2	−0	View file
drivers/media/video/hdpvr/hdpvr-video.c	modified	+1	−1	View file
drivers/media/video/hexium_gemini.c	modified	+13	−116	View file
drivers/media/video/hexium_orion.c	modified	+12	−12	View file
drivers/media/video/ivtv/ivtv-driver.c	modified	+2	−2	View file
drivers/media/video/ivtv/ivtv-fileops.c	modified	+4	−2	View file
drivers/media/video/ivtv/ivtv-ioctl.c	modified	+3	−5	View file
drivers/media/video/ivtv/ivtv-streams.c	modified	+4	−0	View file
drivers/media/video/ivtv/ivtvfb.c	modified	+2	−0	View file
drivers/media/video/m5mols/m5mols.h	modified	+58	−23	View file
drivers/media/video/m5mols/m5mols_capture.c	modified	+3	−8	View file
drivers/media/video/m5mols/m5mols_controls.c	modified	+404	−75	View file
drivers/media/video/m5mols/m5mols_core.c	modified	+9	−84	View file
drivers/media/video/m5mols/m5mols_reg.h	modified	+1	−0	View file
drivers/media/video/marvell-ccic/mcam-core.c	modified	+0	−1	View file
drivers/media/video/mem2mem_testdev.c	modified	+5	−1	View file
drivers/media/video/meye.c	modified	+1	−1	View file
drivers/media/video/msp3400-driver.c	modified	+11	−4	View file
drivers/media/video/mt9m032.c	modified	+2	−2	View file
drivers/media/video/mt9p031.c	modified	+145	−16	View file
drivers/media/video/mt9t112.c	modified	+1	−0	View file
drivers/media/video/mt9v032.c	modified	+1	−1	View file
drivers/media/video/mx1_camera.c	modified	+2	−12	View file
drivers/media/video/mx2_camera.c	modified	+58	−20	View file
drivers/media/video/mx2_emmaprp.c	modified	+6	−2	View file
drivers/media/video/mx3_camera.c	modified	+23	−18	View file
drivers/media/video/mxb.c	modified	+179	−172	View file
drivers/media/video/mxb.h	deleted	+0	−42	View before deletion
drivers/media/video/omap1_camera.c	modified	+10	−12	View file
drivers/media/video/omap24xxcam-dma.c	modified	+10	−10	View file
drivers/media/video/omap24xxcam.c	modified	+1	−2	View file
drivers/media/video/omap24xxcam.h	modified	+7	−7	View file
drivers/media/video/omap3isp/isp.c	modified	+27	−32	View file
drivers/media/video/omap3isp/isp.h	modified	+2	−6	View file
drivers/media/video/omap3isp/ispccdc.c	modified	+238	−18	View file
drivers/media/video/omap3isp/ispccdc.h	modified	+2	−10	View file
drivers/media/video/omap3isp/ispccp2.c	modified	+1	−23	View file
drivers/media/video/omap3isp/ispcsi2.c	modified	+4	−17	View file
drivers/media/video/omap3isp/ispcsi2.h	modified	+0	−1	View file
drivers/media/video/omap3isp/ispcsiphy.c	modified	+3	−1	View file
drivers/media/video/omap3isp/ispcsiphy.h	modified	+2	−13	View file
drivers/media/video/omap3isp/isppreview.c	modified	+388	−246	View file
drivers/media/video/omap3isp/isppreview.h	modified	+21	−55	View file
drivers/media/video/omap3isp/ispqueue.h	modified	+1	−1	View file
drivers/media/video/omap3isp/ispresizer.c	modified	+89	−50	View file
drivers/media/video/omap3isp/ispstat.c	modified	+1	−1	View file
drivers/media/video/omap3isp/ispvideo.c	modified	+167	−136	View file
drivers/media/video/omap3isp/ispvideo.h	modified	+5	−0	View file
drivers/media/video/ov5642.c	modified	+0	−2	View file
drivers/media/video/pms.c	modified	+123	−116	View file
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	modified	+2	−4	View file
drivers/media/video/pvrusb2/pvrusb2-hdw.c	modified	+32	−161	View file
drivers/media/video/pvrusb2/pvrusb2-hdw.h	modified	+1	−8	View file
drivers/media/video/pvrusb2/pvrusb2-v4l2.c	modified	+700	−643	View file
drivers/media/video/pwc/pwc-if.c	modified	+126	−65	View file
drivers/media/video/pwc/pwc-v4l.c	modified	+71	−74	View file
drivers/media/video/pwc/pwc.h	modified	+11	−10	View file
drivers/media/video/pxa_camera.c	modified	+3	−12	View file
drivers/media/video/s2255drv.c	modified	+5	−6	View file
drivers/media/video/s5p-fimc/Kconfig	added	+48	−0	View file
drivers/media/video/s5p-fimc/Makefile	modified	+4	−2	View file
drivers/media/video/s5p-fimc/fimc-capture.c	modified	+318	−188	View file
drivers/media/video/s5p-fimc/fimc-core.c	modified	+176	−983	View file
drivers/media/video/s5p-fimc/fimc-core.h	modified	+81	−191	View file
drivers/media/video/s5p-fimc/fimc-lite-reg.c	added	+300	−0	View file
drivers/media/video/s5p-fimc/fimc-lite-reg.h	added	+150	−0	View file
drivers/media/video/s5p-fimc/fimc-lite.c	added	+1576	−0	View file
drivers/media/video/s5p-fimc/fimc-lite.h	added	+213	−0	View file
drivers/media/video/s5p-fimc/fimc-m2m.c	added	+824	−0	View file
drivers/media/video/s5p-fimc/fimc-mdevice.c	modified	+325	−151	View file
drivers/media/video/s5p-fimc/fimc-mdevice.h	modified	+11	−7	View file
drivers/media/video/s5p-fimc/fimc-reg.c	modified	+333	−283	View file
drivers/media/video/s5p-fimc/fimc-reg.h	added	+326	−0	View file
drivers/media/video/s5p-fimc/mipi-csis.c	modified	+7	−14	View file
drivers/media/video/s5p-fimc/regs-fimc.h	deleted	+0	−301	View before deletion
drivers/media/video/s5p-g2d/g2d.c	modified	+24	−45	View file
drivers/media/video/s5p-g2d/g2d.h	modified	+0	−1	View file
drivers/media/video/s5p-jpeg/jpeg-core.c	modified	+19	−49	View file
drivers/media/video/s5p-jpeg/jpeg-core.h	modified	+0	−2	View file
drivers/media/video/s5p-mfc/s5p_mfc.c	modified	+26	−55	View file
drivers/media/video/s5p-mfc/s5p_mfc_common.h	modified	+0	−2	View file
drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c	modified	+8	−8	View file
drivers/media/video/s5p-mfc/s5p_mfc_enc.c	modified	+4	−2	View file
drivers/media/video/s5p-mfc/s5p_mfc_opr.c	modified	+14	−14	View file
drivers/media/video/s5p-tv/hdmi_drv.c	modified	+222	−258	View file
drivers/media/video/s5p-tv/hdmiphy_drv.c	modified	+188	−37	View file
drivers/media/video/s5p-tv/mixer.h	modified	+2	−1	View file
drivers/media/video/s5p-tv/mixer_drv.c	modified	+1	−1	View file
drivers/media/video/s5p-tv/mixer_reg.c	modified	+10	−5	View file
drivers/media/video/s5p-tv/mixer_video.c	modified	+7	−3	View file
drivers/media/video/s5p-tv/regs-hdmi.h	modified	+1	−0	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+45	−0	View file
drivers/media/video/saa7134/saa7134-dvb.c	modified	+39	−0	View file
drivers/media/video/saa7134/saa7134-input.c	modified	+7	−0	View file
drivers/media/video/saa7134/saa7134-video.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134.h	modified	+1	−0	View file
drivers/media/video/saa7164/saa7164-vbi.c	modified	+2	−2	View file
drivers/media/video/saa7164/saa7164.h	modified	+0	−5	View file
drivers/media/video/sh_mobile_ceu_camera.c	modified	+52	−40	View file
drivers/media/video/sh_vou.c	modified	+4	−0	View file
drivers/media/video/smiapp-pll.c	added	+418	−0	View file
drivers/media/video/smiapp-pll.h	added	+103	−0	View file
drivers/media/video/smiapp/Kconfig	added	+6	−0	View file
drivers/media/video/smiapp/Makefile	added	+5	−0	View file
drivers/media/video/smiapp/smiapp-core.c	added	+2894	−0	View file
drivers/media/video/smiapp/smiapp-limits.c	added	+132	−0	View file
drivers/media/video/smiapp/smiapp-limits.h	added	+128	−0	View file
drivers/media/video/smiapp/smiapp-quirk.c	added	+306	−0	View file
drivers/media/video/smiapp/smiapp-quirk.h	added	+83	−0	View file
drivers/media/video/smiapp/smiapp-reg-defs.h	added	+503	−0	View file
drivers/media/video/smiapp/smiapp-reg.h	added	+122	−0	View file
drivers/media/video/smiapp/smiapp-regs.c	added	+273	−0	View file
drivers/media/video/smiapp/smiapp-regs.h	added	+49	−0	View file
drivers/media/video/smiapp/smiapp.h	added	+252	−0	View file
drivers/media/video/sn9c102/sn9c102_core.c	modified	+1	−3	View file
drivers/media/video/soc_camera.c	modified	+31	−24	View file
drivers/media/video/soc_mediabus.c	modified	+54	−0	View file
drivers/media/video/sta2x11_vip.c	added	+1550	−0	View file
drivers/media/video/sta2x11_vip.h	added	+40	−0	View file
drivers/media/video/stk-webcam.c	modified	+4	−4	View file
drivers/media/video/tda9840.c	modified	+44	−31	View file
drivers/media/video/tlg2300/pd-video.c	modified	+0	−1	View file
drivers/media/video/tm6000/tm6000-input.c	modified	+1	−2	View file
drivers/media/video/tm6000/tm6000-stds.c	modified	+0	−2	View file
drivers/media/video/tm6000/tm6000-video.c	modified	+5	−9	View file
drivers/media/video/tm6000/tm6000.h	modified	+0	−2	View file
drivers/media/video/tuner-core.c	modified	+11	−4	View file
drivers/media/video/tvp5150.c	modified	+2	−9	View file
drivers/media/video/tvp7002.c	modified	+89	−16	View file
drivers/media/video/usbvision/usbvision-core.c	modified	+5	−7	View file
drivers/media/video/usbvision/usbvision-video.c	modified	+4	−0	View file
drivers/media/video/uvc/uvc_ctrl.c	modified	+281	−49	View file
drivers/media/video/uvc/uvc_queue.c	modified	+13	−30	View file
drivers/media/video/uvc/uvc_v4l2.c	modified	+38	−12	View file
drivers/media/video/uvc/uvcvideo.h	modified	+19	−7	View file
drivers/media/video/v4l2-compat-ioctl32.c	modified	+9	−6	View file
drivers/media/video/v4l2-ctrls.c	modified	+255	−47	View file
drivers/media/video/v4l2-dev.c	modified	+203	−15	View file
drivers/media/video/v4l2-event.c	modified	+32	−39	View file
drivers/media/video/v4l2-ioctl.c	modified	+233	−429	View file
drivers/media/video/v4l2-subdev.c	modified	+131	−12	View file
drivers/media/video/via-camera.c	modified	+13	−2	View file
drivers/media/video/videobuf-core.c	modified	+2	−1	View file
drivers/media/video/videobuf-dma-contig.c	modified	+149	−50	View file
drivers/media/video/videobuf-dvb.c	modified	+1	−2	View file
drivers/media/video/videobuf2-core.c	modified	+34	−16	View file
drivers/media/video/vivi.c	modified	+178	−45	View file
drivers/media/video/w9966.c	modified	+41	−53	View file
drivers/media/video/zoran/zoran_device.c	modified	+0	−2	View file
drivers/media/video/zoran/zoran_driver.c	modified	+17	−3	View file
drivers/media/video/zr364xx.c	modified	+0	−2	View file
drivers/staging/android/ashmem.c	modified	+1	−1	View file
drivers/staging/media/as102/as10x_cmd.c	modified	+7	−21	View file
drivers/staging/media/dt3155v4l/dt3155v4l.c	modified	+4	−0	View file
drivers/staging/media/easycap/easycap_main.c	modified	+909	−750	View file
drivers/staging/media/go7007/go7007-v4l2.c	modified	+0	−2	View file
drivers/staging/media/go7007/s2250-loader.c	modified	+2	−0	View file
drivers/staging/media/lirc/lirc_imon.c	modified	+0	−4	View file
drivers/staging/media/lirc/lirc_sasem.c	modified	+0	−4	View file
drivers/usb/gadget/uvc_queue.c	modified	+1	−1	View file
drivers/usb/gadget/uvc_v4l2.c	modified	+1	−1	View file
include/linux/Kbuild	modified	+1	−0	View file
include/linux/dvb/frontend.h	modified	+50	−1	View file
include/linux/dvb/version.h	modified	+1	−1	View file
drivers/input/fixp-arith.h → include/linux/fixp-arith.h	renamed	+0	−0	View file
include/linux/v4l2-dv-timings.h	added	+816	−0	View file
include/linux/v4l2-subdev.h	modified	+41	−0	View file
include/linux/videodev2.h	modified	+304	−68	View file
include/media/media-entity.h	modified	+3	−2	View file
include/media/mt9p031.h	modified	+10	−9	View file
include/media/omap3isp.h	modified	+29	−0	View file
include/media/rc-map.h	modified	+3	−0	View file
include/media/s5p_fimc.h	modified	+16	−0	View file
include/media/saa7146.h	modified	+2	−2	View file
include/media/saa7146_vv.h	modified	+13	−12	View file
include/media/sh_mobile_ceu.h	modified	+1	−0	View file
include/media/smiapp.h	added	+84	−0	View file
include/media/soc_camera.h	modified	+5	−1	View file
include/media/soc_mediabus.h	modified	+21	−0	View file
include/media/v4l2-ctrls.h	modified	+32	−8	View file
include/media/v4l2-dev.h	modified	+25	−0	View file
include/media/v4l2-event.h	modified	+17	−7	View file
include/media/v4l2-ioctl.h	modified	+6	−0	View file
include/media/v4l2-subdev.h	modified	+41	−14	View file
include/media/videobuf-dma-contig.h	modified	+10	−0	View file
kernel/kfifo.c	modified	+1	−0	View file
sound/i2c/other/tea575x-tuner.c	modified	+3	−0	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 6628b4b..3625209 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -70,6 +70,8 @@ IOCTLS = \
 	VIDIOC_SUBDEV_ENUM_MBUS_CODE \
 	VIDIOC_SUBDEV_ENUM_FRAME_SIZE \
 	VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \
+	VIDIOC_SUBDEV_G_SELECTION \
+	VIDIOC_SUBDEV_S_SELECTION \
 
 TYPES = \
 	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \
@@ -193,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_OBJ_DIR)/media_api
+	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@

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 c7a4ca5..e633c09 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -531,6 +531,139 @@ typedef enum fe_delivery_system {
 				here are referring to what can be found in the TMCC-structure -
 				independent of the mode.</para>
 		</section>
+		<section id="DTV-ATSCMH-FIC-VER">
+			<title><constant>DTV_ATSCMH_FIC_VER</constant></title>
+			<para>Version number of the FIC (Fast Information Channel) signaling data.</para>
+			<para>FIC is used for relaying information to allow rapid service acquisition by the receiver.</para>
+			<para>Possible values: 0, 1, 2, 3, ..., 30, 31</para>
+		</section>
+		<section id="DTV-ATSCMH-PARADE-ID">
+			<title><constant>DTV_ATSCMH_PARADE_ID</constant></title>
+			<para>Parade identification number</para>
+			<para>A parade is a collection of up to eight MH groups, conveying one or two ensembles.</para>
+			<para>Possible values: 0, 1, 2, 3, ..., 126, 127</para>
+		</section>
+		<section id="DTV-ATSCMH-NOG">
+			<title><constant>DTV_ATSCMH_NOG</constant></title>
+			<para>Number of MH groups per MH subframe for a designated parade.</para>
+			<para>Possible values: 1, 2, 3, 4, 5, 6, 7, 8</para>
+		</section>
+		<section id="DTV-ATSCMH-TNOG">
+			<title><constant>DTV_ATSCMH_TNOG</constant></title>
+			<para>Total number of MH groups including all MH groups belonging to all MH parades in one MH subframe.</para>
+			<para>Possible values: 0, 1, 2, 3, ..., 30, 31</para>
+		</section>
+		<section id="DTV-ATSCMH-SGN">
+			<title><constant>DTV_ATSCMH_SGN</constant></title>
+			<para>Start group number.</para>
+			<para>Possible values: 0, 1, 2, 3, ..., 14, 15</para>
+		</section>
+		<section id="DTV-ATSCMH-PRC">
+			<title><constant>DTV_ATSCMH_PRC</constant></title>
+			<para>Parade repetition cycle.</para>
+			<para>Possible values: 1, 2, 3, 4, 5, 6, 7, 8</para>
+		</section>
+		<section id="DTV-ATSCMH-RS-FRAME-MODE">
+			<title><constant>DTV_ATSCMH_RS_FRAME_MODE</constant></title>
+			<para>RS frame mode.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_rs_frame_mode {
+	ATSCMH_RSFRAME_PRI_ONLY  = 0,
+	ATSCMH_RSFRAME_PRI_SEC   = 1,
+} atscmh_rs_frame_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-RS-FRAME-ENSEMBLE">
+			<title><constant>DTV_ATSCMH_RS_FRAME_ENSEMBLE</constant></title>
+			<para>RS frame ensemble.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_rs_frame_ensemble {
+	ATSCMH_RSFRAME_ENS_PRI   = 0,
+	ATSCMH_RSFRAME_ENS_SEC   = 1,
+} atscmh_rs_frame_ensemble_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-RS-CODE-MODE-PRI">
+			<title><constant>DTV_ATSCMH_RS_CODE_MODE_PRI</constant></title>
+			<para>RS code mode (primary).</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_rs_code_mode {
+	ATSCMH_RSCODE_211_187    = 0,
+	ATSCMH_RSCODE_223_187    = 1,
+	ATSCMH_RSCODE_235_187    = 2,
+} atscmh_rs_code_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-RS-CODE-MODE-SEC">
+			<title><constant>DTV_ATSCMH_RS_CODE_MODE_SEC</constant></title>
+			<para>RS code mode (secondary).</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_rs_code_mode {
+	ATSCMH_RSCODE_211_187    = 0,
+	ATSCMH_RSCODE_223_187    = 1,
+	ATSCMH_RSCODE_235_187    = 2,
+} atscmh_rs_code_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-SCCC-BLOCK-MODE">
+			<title><constant>DTV_ATSCMH_SCCC_BLOCK_MODE</constant></title>
+			<para>Series Concatenated Convolutional Code Block Mode.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_sccc_block_mode {
+	ATSCMH_SCCC_BLK_SEP      = 0,
+	ATSCMH_SCCC_BLK_COMB     = 1,
+} atscmh_sccc_block_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-SCCC-CODE-MODE-A">
+			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_A</constant></title>
+			<para>Series Concatenated Convolutional Code Rate.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_sccc_code_mode {
+	ATSCMH_SCCC_CODE_HLF     = 0,
+	ATSCMH_SCCC_CODE_QTR     = 1,
+} atscmh_sccc_code_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-SCCC-CODE-MODE-B">
+			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant></title>
+			<para>Series Concatenated Convolutional Code Rate.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_sccc_code_mode {
+	ATSCMH_SCCC_CODE_HLF     = 0,
+	ATSCMH_SCCC_CODE_QTR     = 1,
+} atscmh_sccc_code_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-SCCC-CODE-MODE-C">
+			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_C</constant></title>
+			<para>Series Concatenated Convolutional Code Rate.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_sccc_code_mode {
+	ATSCMH_SCCC_CODE_HLF     = 0,
+	ATSCMH_SCCC_CODE_QTR     = 1,
+} atscmh_sccc_code_mode_t;
+</programlisting>
+		</section>
+		<section id="DTV-ATSCMH-SCCC-CODE-MODE-D">
+			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_D</constant></title>
+			<para>Series Concatenated Convolutional Code Rate.</para>
+			<para>Possible values are:</para>
+<programlisting>
+typedef enum atscmh_sccc_code_mode {
+	ATSCMH_SCCC_CODE_HLF     = 0,
+	ATSCMH_SCCC_CODE_QTR     = 1,
+} atscmh_sccc_code_mode_t;
+</programlisting>
+		</section>
 	</section>
 	<section id="DTV-API-VERSION">
 	<title><constant>DTV_API_VERSION</constant></title>
@@ -774,6 +907,33 @@ typedef enum fe_hierarchy {
 				<listitem><para><link linkend="DTV-BANDWIDTH-HZ"><constant>DTV_BANDWIDTH_HZ</constant></link></para></listitem>
 			</itemizedlist>
 		</section>
+		<section id="atscmh-params">
+			<title>ATSC-MH delivery system</title>
+			<para>The following parameters are valid for ATSC-MH:</para>
+			<itemizedlist mark='opencircle'>
+				<listitem><para><link linkend="DTV-API-VERSION"><constant>DTV_API_VERSION</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-DELIVERY-SYSTEM"><constant>DTV_DELIVERY_SYSTEM</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-TUNE"><constant>DTV_TUNE</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-CLEAR"><constant>DTV_CLEAR</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-FREQUENCY"><constant>DTV_FREQUENCY</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-BANDWIDTH-HZ"><constant>DTV_BANDWIDTH_HZ</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-FIC-VER"><constant>DTV_ATSCMH_FIC_VER</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-PARADE-ID"><constant>DTV_ATSCMH_PARADE_ID</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-NOG"><constant>DTV_ATSCMH_NOG</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-TNOG"><constant>DTV_ATSCMH_TNOG</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SGN"><constant>DTV_ATSCMH_SGN</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-PRC"><constant>DTV_ATSCMH_PRC</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-RS-FRAME-MODE"><constant>DTV_ATSCMH_RS_FRAME_MODE</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-RS-FRAME-ENSEMBLE"><constant>DTV_ATSCMH_RS_FRAME_ENSEMBLE</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-CODE-MODE-PRI"><constant>DTV_ATSCMH_CODE_MODE_PRI</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-CODE-MODE-SEC"><constant>DTV_ATSCMH_CODE_MODE_SEC</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SCCC-BLOCK-MODE"><constant>DTV_ATSCMH_SCCC_BLOCK_MODE</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-A"><constant>DTV_ATSCMH_SCCC_CODE_MODE_A</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-B"><constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-C"><constant>DTV_ATSCMH_SCCC_CODE_MODE_C</constant></link></para></listitem>
+				<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-D"><constant>DTV_ATSCMH_SCCC_CODE_MODE_D</constant></link></para></listitem>
+			</itemizedlist>
+		</section>
 	</section>
 	<section id="frontend-property-cable-systems">
 	<title>Properties used on cable delivery systems</title>

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 7dc65c5..7c49fac 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -197,4 +197,33 @@ in the frequency range from 87,5 to 108,0 MHz</title>
       <title>NTSC-4: United States RBDS Standard</title>
     </biblioentry>
 
+    <biblioentry id="iso12232">
+      <abbrev>ISO&nbsp;12232:2006</abbrev>
+      <authorgroup>
+	<corpauthor>International Organization for Standardization
+(<ulink url="http://www.iso.org">http://www.iso.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>Photography &mdash; Digital still cameras &mdash; Determination
+      of exposure index, ISO speed ratings, standard output sensitivity, and
+      recommended exposure index</title>
+    </biblioentry>
+
+    <biblioentry id="cea861">
+      <abbrev>CEA-861-E</abbrev>
+      <authorgroup>
+	<corpauthor>Consumer Electronics Association
+(<ulink url="http://www.ce.org">http://www.ce.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>A DTV Profile for Uncompressed High Speed Digital Interfaces</title>
+    </biblioentry>
+
+    <biblioentry id="vesadmt">
+      <abbrev>VESA&nbsp;DMT</abbrev>
+      <authorgroup>
+	<corpauthor>Video Electronics Standards Association
+(<ulink url="http://www.vesa.org">http://www.vesa.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>VESA and Industry Standards and Guidelines for Computer Display Monitor Timing (DMT)</title>
+    </biblioentry>
+
   </bibliography>

Documentation/DocBook/media/v4l/common.xml

View file

diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml
index c79278a..4101aeb 100644
--- a/Documentation/DocBook/media/v4l/common.xml
+++ b/Documentation/DocBook/media/v4l/common.xml
@@ -724,41 +724,49 @@ if (-1 == ioctl (fd, &VIDIOC-S-STD;, &amp;std_id)) {
 }
       </programlisting>
     </example>
+  </section>
   <section id="dv-timings">
 	<title>Digital Video (DV) Timings</title>
 	<para>
-	The video standards discussed so far has been dealing with Analog TV and the
+	The video standards discussed so far have been dealing with Analog TV and the
 corresponding video timings. Today there are many more different hardware interfaces
 such as High Definition TV interfaces (HDMI), VGA, DVI connectors etc., that carry
 video signals and there is a need to extend the API to select the video timings
 for these interfaces. Since it is not possible to extend the &v4l2-std-id; due to
-the limited bits available, a new set of IOCTLs is added to set/get video timings at
+the limited bits available, a new set of IOCTLs was added to set/get video timings at
 the input and output: </para><itemizedlist>
 	<listitem>
-	<para>DV Presets: Digital Video (DV) presets. These are IDs representing a
+	<para>DV Timings: This will allow applications to define detailed
+video timings for the interface. This includes parameters such as width, height,
+polarities, frontporch, backporch etc. The <filename>linux/v4l2-dv-timings.h</filename>
+header can be used to get the timings of the formats in the <xref linkend="cea861" /> and
+<xref linkend="vesadmt" /> standards.
+	</para>
+	</listitem>
+	<listitem>
+	<para>DV Presets: Digital Video (DV) presets (<emphasis role="bold">deprecated</emphasis>).
+	These are IDs representing a
 video timing at the input/output. Presets are pre-defined timings implemented
 by the hardware according to video standards. A __u32 data type is used to represent
 a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions
-to support as many different presets as needed.</para>
-	</listitem>
-	<listitem>
-	<para>Custom DV Timings: This will allow applications to define more detailed
-custom video timings for the interface. This includes parameters such as width, height,
-polarities, frontporch, backporch etc.
-	</para>
+to support as many different presets as needed. This API is deprecated in favor of the DV Timings
+API.</para>
 	</listitem>
 	</itemizedlist>
+	<para>To enumerate and query the attributes of the DV timings supported by a device,
+	applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls.
+	To set DV timings for the device, applications use the
+&VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the
+&VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications
+use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para>
 	<para>To enumerate and query the attributes of DV presets supported by a device,
 applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset,
 applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the
-&VIDIOC-S-DV-PRESET; ioctl.</para>
-	<para>To set custom DV timings for the device, applications use the
-&VIDIOC-S-DV-TIMINGS; ioctl and to get current custom DV timings they use the
-&VIDIOC-G-DV-TIMINGS; ioctl.</para>
+&VIDIOC-S-DV-PRESET; ioctl. To detect the preset as seen by the video receiver applications
+use the &VIDIOC-QUERY-DV-PRESET; ioctl.</para>
 	<para>Applications can make use of the <xref linkend="input-capabilities" /> and
 <xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the
 video timings for the device.</para>
-	</section>
   </section>
 
   &sub-controls;

Documentation/DocBook/media/v4l/compat.xml

View file

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index bce97c5..ea42ef8 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2407,6 +2407,54 @@ details.</para>
 	  <para>Added <link linkend="jpeg-controls">JPEG compression control
 	  class</link>.</para>
         </listitem>
+        <listitem>
+	  <para>Extended the DV Timings API:
+	  &VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and
+	  &VIDIOC-DV-TIMINGS-CAP;.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 3.5</title>
+      <orderedlist>
+        <listitem>
+	  <para>Added integer menus, the new type will be
+	  V4L2_CTRL_TYPE_INTEGER_MENU.</para>
+        </listitem>
+        <listitem>
+	  <para>Added selection API for V4L2 subdev interface:
+	  &VIDIOC-SUBDEV-G-SELECTION; and
+	  &VIDIOC-SUBDEV-S-SELECTION;.</para>
+        </listitem>
+        <listitem>
+	  <para> Added <constant>V4L2_COLORFX_ANTIQUE</constant>,
+	  <constant>V4L2_COLORFX_ART_FREEZE</constant>,
+	  <constant>V4L2_COLORFX_AQUA</constant>,
+	  <constant>V4L2_COLORFX_SILHOUETTE</constant>,
+	  <constant>V4L2_COLORFX_SOLARIZATION</constant>,
+	  <constant>V4L2_COLORFX_VIVID</constant> and
+	  <constant>V4L2_COLORFX_ARBITRARY_CBCR</constant> menu items
+	  to the <constant>V4L2_CID_COLORFX</constant> control.</para>
+        </listitem>
+        <listitem>
+	  <para> Added <constant>V4L2_CID_COLORFX_CBCR</constant> control.</para>
+        </listitem>
+        <listitem>
+	  <para> Added camera controls <constant>V4L2_CID_AUTO_EXPOSURE_BIAS</constant>,
+	  <constant>V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE</constant>,
+	  <constant>V4L2_CID_IMAGE_STABILIZATION</constant>,
+	  <constant>V4L2_CID_ISO_SENSITIVITY</constant>,
+	  <constant>V4L2_CID_ISO_SENSITIVITY_AUTO</constant>,
+	  <constant>V4L2_CID_EXPOSURE_METERING</constant>,
+	  <constant>V4L2_CID_SCENE_MODE</constant>,
+	  <constant>V4L2_CID_3A_LOCK</constant>,
+	  <constant>V4L2_CID_AUTO_FOCUS_START</constant>,
+	  <constant>V4L2_CID_AUTO_FOCUS_STOP</constant>,
+	  <constant>V4L2_CID_AUTO_FOCUS_STATUS</constant> and
+	  <constant>V4L2_CID_AUTO_FOCUS_RANGE</constant>.
+	  </para>
+        </listitem>
       </orderedlist>
     </section>
 
@@ -2508,6 +2556,10 @@ and may change in the future.</para>
 ioctls.</para>
         </listitem>
         <listitem>
+	  <para>&VIDIOC-DECODER-CMD; and &VIDIOC-TRY-DECODER-CMD;
+ioctls.</para>
+        </listitem>
+        <listitem>
 	  <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER;
 ioctls.</para>
         </listitem>
@@ -2515,6 +2567,10 @@ ioctls.</para>
 	  <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
         </listitem>
         <listitem>
+	  <para>&VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and
+	  &VIDIOC-DV-TIMINGS-CAP; ioctls.</para>
+        </listitem>
+        <listitem>
 	  <para>Flash API. <xref linkend="flash-controls" /></para>
         </listitem>
         <listitem>
@@ -2523,6 +2579,14 @@ ioctls.</para>
         <listitem>
 	  <para>Selection API. <xref linkend="selection-api" /></para>
         </listitem>
+        <listitem>
+	  <para>Sub-device selection API: &VIDIOC-SUBDEV-G-SELECTION;
+	  and &VIDIOC-SUBDEV-S-SELECTION; ioctls.</para>
+        </listitem>
+        <listitem>
+	  <para><link linkend="v4l2-auto-focus-area"><constant>
+	  V4L2_CID_AUTO_FOCUS_AREA</constant></link> control.</para>
+        </listitem>
       </itemizedlist>
     </section>
 
@@ -2538,6 +2602,17 @@ interfaces and should not be implemented in new drivers.</para>
 <constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
 <xref linkend="extended-controls" />.</para>
         </listitem>
+        <listitem>
+	  <para>&VIDIOC-G-DV-PRESET;, &VIDIOC-S-DV-PRESET;, &VIDIOC-ENUM-DV-PRESETS; and
+	  &VIDIOC-QUERY-DV-PRESET; ioctls. Use the DV Timings API (<xref linkend="dv-timings" />).</para>
+        </listitem>
+        <listitem>
+	  <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and
+	  <constant>VIDIOC_SUBDEV_S_CROP</constant> ioctls. Use
+	  <constant>VIDIOC_SUBDEV_G_SELECTION</constant> and
+	  <constant>VIDIOC_SUBDEV_S_SELECTION</constant>, <xref
+	  linkend="vidioc-subdev-g-selection" />.</para>
+        </listitem>
       </itemizedlist>
     </section>
   </section>

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 dd03cf4..676bc46 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -285,18 +285,92 @@ minimum value disables backlight compensation.</entry>
 	  <row id="v4l2-colorfx">
 	    <entry><constant>V4L2_CID_COLORFX</constant></entry>
 	    <entry>enum</entry>
-	    <entry>Selects a color effect. Possible values for
-<constant>enum v4l2_colorfx</constant> are:
-<constant>V4L2_COLORFX_NONE</constant> (0),
-<constant>V4L2_COLORFX_BW</constant> (1),
-<constant>V4L2_COLORFX_SEPIA</constant> (2),
-<constant>V4L2_COLORFX_NEGATIVE</constant> (3),
-<constant>V4L2_COLORFX_EMBOSS</constant> (4),
-<constant>V4L2_COLORFX_SKETCH</constant> (5),
-<constant>V4L2_COLORFX_SKY_BLUE</constant> (6),
-<constant>V4L2_COLORFX_GRASS_GREEN</constant> (7),
-<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8) and
-<constant>V4L2_COLORFX_VIVID</constant> (9).</entry>
+	    <entry>Selects a color effect. The following values are defined:
+	    </entry>
+	  </row><row>
+	  <entry></entry>
+	  <entry></entry>
+	    <entrytbl spanname="descr" cols="2">
+	      <tbody valign="top">
+		<row>
+		  <entry><constant>V4L2_COLORFX_NONE</constant>&nbsp;</entry>
+		  <entry>Color effect is disabled.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_ANTIQUE</constant>&nbsp;</entry>
+		  <entry>An aging (old photo) effect.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_ART_FREEZE</constant>&nbsp;</entry>
+		  <entry>Frost color effect.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_AQUA</constant>&nbsp;</entry>
+		  <entry>Water color, cool tone.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_BW</constant>&nbsp;</entry>
+		  <entry>Black and white.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_EMBOSS</constant>&nbsp;</entry>
+		  <entry>Emboss, the highlights and shadows replace light/dark boundaries
+		  and low contrast areas are set to a gray background.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_GRASS_GREEN</constant>&nbsp;</entry>
+		  <entry>Grass green.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_NEGATIVE</constant>&nbsp;</entry>
+		  <entry>Negative.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SEPIA</constant>&nbsp;</entry>
+		  <entry>Sepia tone.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SKETCH</constant>&nbsp;</entry>
+		  <entry>Sketch.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SKIN_WHITEN</constant>&nbsp;</entry>
+		  <entry>Skin whiten.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SKY_BLUE</constant>&nbsp;</entry>
+		  <entry>Sky blue.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SOLARIZATION</constant>&nbsp;</entry>
+		  <entry>Solarization, the image is partially reversed in tone,
+		  only color values above or below a certain threshold are inverted.
+		  </entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SILHOUETTE</constant>&nbsp;</entry>
+		  <entry>Silhouette (outline).</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_VIVID</constant>&nbsp;</entry>
+		  <entry>Vivid colors.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_COLORFX_SET_CBCR</constant>&nbsp;</entry>
+		  <entry>The Cb and Cr chroma components are replaced by fixed
+		  coefficients determined by <constant>V4L2_CID_COLORFX_CBCR</constant>
+		  control.</entry>
+		</row>
+	      </tbody>
+	    </entrytbl>
+	  </row>
+	  <row>
+	    <entry><constant>V4L2_CID_COLORFX_CBCR</constant></entry>
+	    <entry>integer</entry>
+	    <entry>Determines the Cb and Cr coefficients for <constant>V4L2_COLORFX_SET_CBCR</constant>
+	    color effect. Bits [7:0] of the supplied 32 bit value are interpreted as
+	    Cr component, bits [15:8] as Cb component and bits [31:16] must be zero.
+	  </entry>
 	  </row>
 	  <row>
 	    <entry><constant>V4L2_CID_ROTATE</constant></entry>
@@ -2775,6 +2849,51 @@ remain constant.</entry>
 	  <row><entry></entry></row>
 
 	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_EXPOSURE_BIAS</constant>&nbsp;</entry>
+	    <entry>integer menu</entry>
+	  </row><row><entry spanname="descr"> Determines the automatic
+exposure compensation, it is effective only when <constant>V4L2_CID_EXPOSURE_AUTO</constant>
+control is set to <constant>AUTO</constant>, <constant>SHUTTER_PRIORITY </constant>
+or <constant>APERTURE_PRIORITY</constant>.
+It is expressed in terms of EV, drivers should interpret the values as 0.001 EV
+units, where the value 1000 stands for +1 EV.
+<para>Increasing the exposure compensation value is equivalent to decreasing
+the exposure value (EV) and will increase the amount of light at the image
+sensor. The camera performs the exposure compensation by adjusting absolute
+exposure time and/or aperture.</para></entry>
+	  </row>
+	  <row><entry></entry></row>
+
+	  <row id="v4l2-exposure-metering">
+	    <entry spanname="id"><constant>V4L2_CID_EXPOSURE_METERING</constant>&nbsp;</entry>
+	    <entry>enum&nbsp;v4l2_exposure_metering</entry>
+	  </row><row><entry spanname="descr">Determines how the camera measures
+the amount of light available for the frame exposure. Possible values are:</entry>
+	  </row>
+	  <row>
+	    <entrytbl spanname="descr" cols="2">
+	      <tbody valign="top">
+		<row>
+		  <entry><constant>V4L2_EXPOSURE_METERING_AVERAGE</constant>&nbsp;</entry>
+		  <entry>Use the light information coming from the entire frame
+and average giving no weighting to any particular portion of the metered area.
+		  </entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_EXPOSURE_METERING_CENTER_WEIGHTED</constant>&nbsp;</entry>
+		  <entry>Average the light information coming from the entire frame
+giving priority to the center of the metered area.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant>&nbsp;</entry>
+		  <entry>Measure only very small area at the center of the frame.</entry>
+		</row>
+	      </tbody>
+	    </entrytbl>
+	  </row>
+	  <row><entry></entry></row>
+
+	  <row>
 	    <entry spanname="id"><constant>V4L2_CID_PAN_RELATIVE</constant>&nbsp;</entry>
 	    <entry>integer</entry>
 	  </row><row><entry spanname="descr">This control turns the
@@ -2857,13 +2976,107 @@ negative values towards infinity. This is a write-only control.</entry>
 	  <row>
 	    <entry spanname="id"><constant>V4L2_CID_FOCUS_AUTO</constant>&nbsp;</entry>
 	    <entry>boolean</entry>
-	  </row><row><entry spanname="descr">Enables automatic focus
-adjustments. The effect of manual focus adjustments while this feature
+	  </row><row><entry spanname="descr">Enables continuous automatic
+focus adjustments. The effect of manual focus adjustments while this feature
 is enabled is undefined, drivers should ignore such requests.</entry>
 	  </row>
 	  <row><entry></entry></row>
 
 	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_AUTO_FOCUS_START</constant>&nbsp;</entry>
+	    <entry>button</entry>
+	  </row><row><entry spanname="descr">Starts single auto focus process.
+The effect of setting this control when <constant>V4L2_CID_FOCUS_AUTO</constant>
+is set to <constant>TRUE</constant> (1) is undefined, drivers should ignore