Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

4d9708ea · Linus Torvalds <[email protected]> · 2014-10-10 22:04:49 -04:00

Pull media updates from Mauro Carvalho Chehab:

 - new IR driver: hix5hd2-ir

 - the virtual test driver (vivi) was replaced by vivid, with has an
   almost complete set of features to emulate most v4l2 devices and
   properly test all sorts of userspace apps

 - the as102 driver had several bugs fixed and was properly split into a
   frontend and a core driver.  With that, it got promoted from staging
   into mainstream

 - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver)

 - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522)

 - one new PCI driver for ISDB-T/ISDB-S (pt3 driver)

 - saa7134 driver got support for go7007-based devices

 - added a new PCI driver for Techwell 68xx chipsets (tw68)

 - a new platform driver was added (coda)

 - new tuner drivers: mxl301rf and qm1d1c0042

 - a new DVB USB driver was added for DVBSky S860 & similar devices

 - added a new SDR driver (hackrf)

 - usbtv got audio support

 - several platform drivers are now compiled with COMPILE_TEST

 - a series of compiler fixup patches, making sparse/spatch happier with
   the media stuff and removing several warnings, especially on those
   platform drivers that didn't use to compile on x86

 - Support for several new modern devices got added

 - lots of other fixes, improvements and cleanups

* tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

Commit: 4d9708ea5e5a45973df7cf965805fdfb185dd5bf
Parents: 754c7809 · a66d05d5

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

Changes

474 files changed · +36213 −13050

File	Status	Add	Del	Content
Documentation/DocBook/media/v4l/compat.xml	modified	+6	−0	View file
Documentation/DocBook/media/v4l/controls.xml	modified	+55	−0	View file
Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml	modified	+48	−4	View file
Documentation/DocBook/media/v4l/vidioc-dqevent.xml	modified	+4	−3	View file
Documentation/DocBook/media/v4l/vidioc-g-edid.xml	modified	+7	−7	View file
Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml	modified	+1	−1	View file
Documentation/devicetree/bindings/media/hix5hd2-ir.txt	added	+25	−0	View file
Documentation/dvb/get_dvb_firmware	modified	+13	−11	View file
Documentation/video4linux/vivid.txt	added	+1111	−0	View file
MAINTAINERS	modified	+27	−1	View file
drivers/media/common/b2c2/flexcop.h	modified	+1	−1	View file
drivers/media/common/saa7146/saa7146_fops.c	modified	+0	−3	View file
drivers/media/common/siano/sms-cards.c	modified	+6	−0	View file
drivers/media/common/siano/sms-cards.h	modified	+1	−0	View file
drivers/media/common/siano/smscoreapi.c	modified	+1	−3	View file
drivers/media/dvb-core/dmxdev.c	modified	+5	−2	View file
drivers/media/dvb-core/dvb-usb-ids.h	modified	+2	−0	View file
drivers/media/dvb-core/dvb_frontend.c	modified	+32	−13	View file
drivers/media/dvb-core/dvb_frontend.h	modified	+2	−0	View file
drivers/media/dvb-core/dvb_ringbuffer.c	modified	+26	−0	View file
drivers/media/dvb-core/dvb_ringbuffer.h	modified	+2	−0	View file
drivers/media/dvb-frontends/Kconfig	modified	+20	−0	View file
drivers/media/dvb-frontends/Makefile	modified	+3	−1	View file
drivers/media/dvb-frontends/af9013.c	modified	+12	−12	View file
drivers/media/dvb-frontends/af9033.c	modified	+425	−332	View file
drivers/media/dvb-frontends/af9033.h	modified	+20	−38	View file
drivers/media/dvb-frontends/af9033_priv.h	modified	+1	−0	View file
drivers/media/dvb-frontends/as102_fe.c	added	+480	−0	View file
drivers/media/dvb-frontends/as102_fe.h	added	+29	−0	View file
drivers/staging/media/as102/as10x_types.h → drivers/media/dvb-frontends/as102_fe_types.h	renamed	+0	−6	View file
drivers/media/dvb-frontends/bcm3510.c	modified	+3	−3	View file
drivers/media/dvb-frontends/cxd2820r_c.c	modified	+2	−2	View file
drivers/media/dvb-frontends/cxd2820r_core.c	modified	+2	−2	View file
drivers/media/dvb-frontends/cxd2820r_t.c	modified	+2	−2	View file
drivers/media/dvb-frontends/dib7000p.c	modified	+1	−1	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+19	−19	View file
drivers/media/dvb-frontends/drxd_hard.c	modified	+2	−7	View file
drivers/media/dvb-frontends/drxk_hard.c	modified	+19	−18	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+74	−27	View file
drivers/media/dvb-frontends/m88ds3103.h	modified	+30	−5	View file
drivers/media/dvb-frontends/mb86a16.c	modified	+4	−2	View file
drivers/media/dvb-frontends/mb86a20s.c	modified	+7	−7	View file
drivers/media/dvb-frontends/mt312.c	modified	+1	−1	View file
drivers/media/dvb-frontends/or51211.c	modified	+1	−1	View file
drivers/media/dvb-frontends/rtl2832.c	modified	+1	−1	View file
drivers/media/dvb-frontends/rtl2832_sdr.c	modified	+56	−62	View file
drivers/media/dvb-frontends/si2165.c	modified	+43	−20	View file
drivers/media/dvb-frontends/si2165_priv.h	modified	+1	−1	View file
drivers/media/dvb-frontends/si2168.c	modified	+83	−46	View file
drivers/media/dvb-frontends/si2168.h	modified	+6	−0	View file
drivers/media/dvb-frontends/si2168_priv.h	modified	+2	−0	View file
drivers/media/dvb-frontends/si21xx.c	modified	+3	−0	View file
drivers/media/dvb-frontends/sp2.c	added	+441	−0	View file
drivers/media/dvb-frontends/sp2.h	added	+53	−0	View file
drivers/media/dvb-frontends/sp2_priv.h	added	+50	−0	View file
drivers/media/dvb-frontends/sp8870.c	modified	+1	−2	View file
drivers/media/dvb-frontends/stv0367.c	modified	+4	−8	View file
drivers/media/dvb-frontends/stv0900_core.c	modified	+2	−5	View file
drivers/media/dvb-frontends/stv0900_sw.c	modified	+2	−1	View file
drivers/media/dvb-frontends/tc90522.c	added	+840	−0	View file
drivers/media/dvb-frontends/tc90522.h	added	+42	−0	View file
drivers/media/dvb-frontends/tda10071.c	modified	+1	−1	View file
drivers/media/dvb-frontends/zl10039.c	modified	+1	−1	View file
drivers/media/firewire/firedtv-avc.c	modified	+10	−0	View file
drivers/media/i2c/adv7343_regs.h	modified	+1	−1	View file
drivers/media/i2c/adv7604.c	modified	+1	−1	View file
drivers/media/i2c/adv7842.c	modified	+3	−1	View file
drivers/media/i2c/lm3560.c	modified	+2	−2	View file
drivers/media/i2c/ov7670.c	modified	+1	−13	View file
drivers/media/i2c/s5k5baf.c	modified	+1	−1	View file
drivers/media/i2c/saa6752hs.c	modified	+3	−3	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+100	−43	View file
drivers/media/i2c/smiapp/smiapp.h	modified	+4	−0	View file
drivers/media/i2c/soc_camera/mt9t112.c	modified	+1	−3	View file
drivers/media/i2c/soc_camera/ov772x.c	modified	+1	−4	View file
drivers/media/i2c/soc_camera/ov9740.c	modified	+2	−2	View file
drivers/media/i2c/tda7432.c	modified	+1	−1	View file
drivers/media/i2c/tvp7002.c	modified	+8	−13	View file
drivers/media/i2c/vs6624.c	modified	+1	−13	View file
drivers/media/media-device.c	modified	+2	−4	View file
drivers/media/media-devnode.c	modified	+1	−2	View file
drivers/media/parport/pms.c	modified	+6	−1	View file
drivers/media/pci/Kconfig	modified	+2	−0	View file
drivers/media/pci/Makefile	modified	+2	−1	View file
drivers/media/pci/bt8xx/bttv-driver.c	modified	+2	−3	View file
drivers/media/pci/bt8xx/dst_ca.c	modified	+1	−3	View file
drivers/media/pci/cx18/cx18-alsa-pcm.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-firmware.c	modified	+3	−3	View file
drivers/media/pci/cx18/cx18-queue.c	modified	+1	−1	View file
drivers/media/pci/cx23885/Kconfig	modified	+6	−3	View file
drivers/media/pci/cx23885/Makefile	modified	+0	−1	View file
drivers/media/pci/cx23885/altera-ci.c	modified	+2	−6	View file
drivers/media/pci/cx23885/altera-ci.h	modified	+0	−4	View file
drivers/media/pci/cx23885/cimax2.c	modified	+0	−4	View file
drivers/media/pci/cx23885/cimax2.h	modified	+0	−4	View file
drivers/media/pci/cx23885/cx23885-417.c	modified	+149	−354	View file
drivers/media/pci/cx23885/cx23885-alsa.c	modified	+90	−19	View file
drivers/media/pci/cx23885/cx23885-av.c	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-av.h	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-cards.c	modified	+26	−6	View file
drivers/media/pci/cx23885/cx23885-core.c	modified	+118	−244	View file
drivers/media/pci/cx23885/cx23885-dvb.c	modified	+268	−55	View file
drivers/media/pci/cx23885/cx23885-f300.c	modified	+0	−4	View file
drivers/media/pci/cx23885/cx23885-i2c.c	modified	+0	−12	View file
drivers/media/pci/cx23885/cx23885-input.c	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-input.h	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-ioctl.c	modified	+3	−7	View file
drivers/media/pci/cx23885/cx23885-ioctl.h	modified	+0	−4	View file
drivers/media/pci/cx23885/cx23885-ir.c	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-ir.h	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885-reg.h	modified	+0	−4	View file
drivers/media/pci/cx23885/cx23885-vbi.c	modified	+130	−154	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+324	−970	View file
drivers/media/pci/cx23885/cx23885-video.h	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23885.h	modified	+50	−86	View file
drivers/media/pci/cx23885/cx23888-ir.c	modified	+0	−5	View file
drivers/media/pci/cx23885/cx23888-ir.h	modified	+0	−5	View file
drivers/media/pci/cx23885/netup-eeprom.c	modified	+0	−4	View file
drivers/media/pci/cx23885/netup-eeprom.h	modified	+0	−4	View file
drivers/media/pci/cx23885/netup-init.c	modified	+0	−4	View file
drivers/media/pci/cx23885/netup-init.h	modified	+0	−4	View file
drivers/media/pci/cx25821/cx25821-video-upstream.c	modified	+3	−2	View file
drivers/media/pci/cx88/cx88-cards.c	modified	+316	−316	View file
drivers/media/pci/cx88/cx88-video.c	modified	+0	−3	View file
drivers/media/pci/ddbridge/ddbridge-core.c	modified	+14	−16	View file
drivers/media/pci/ddbridge/ddbridge.h	modified	+5	−7	View file
drivers/media/pci/dm1105/dm1105.c	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-alsa-pcm.c	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-firmware.c	modified	+2	−2	View file
drivers/media/pci/ivtv/ivtv-irq.c	modified	+5	−7	View file
drivers/media/pci/mantis/hopper_vp3028.c	modified	+1	−1	View file
drivers/media/pci/mantis/mantis_common.h	modified	+1	−1	View file
drivers/media/pci/mantis/mantis_vp1033.c	modified	+2	−2	View file
drivers/media/pci/mantis/mantis_vp1034.c	modified	+1	−1	View file
drivers/media/pci/mantis/mantis_vp1041.c	modified	+2	−2	View file
drivers/media/pci/mantis/mantis_vp2033.c	modified	+2	−2	View file
drivers/media/pci/mantis/mantis_vp2040.c	modified	+2	−2	View file
drivers/media/pci/mantis/mantis_vp3030.c	modified	+2	−2	View file
drivers/media/pci/ngene/ngene-cards.c	modified	+1	−1	View file
drivers/media/pci/ngene/ngene-core.c	modified	+6	−8	View file
drivers/media/pci/ngene/ngene-dvb.c	modified	+3	−4	View file
drivers/media/pci/ngene/ngene.h	modified	+1	−1	View file
drivers/media/pci/pt3/Kconfig	added	+10	−0	View file
drivers/media/pci/pt3/Makefile	added	+8	−0	View file
drivers/media/pci/pt3/pt3.c	added	+876	−0	View file
drivers/media/pci/pt3/pt3.h	added	+186	−0	View file
drivers/media/pci/pt3/pt3_dma.c	added	+225	−0	View file
drivers/media/pci/pt3/pt3_i2c.c	added	+240	−0	View file
drivers/media/pci/saa7134/Kconfig	modified	+8	−0	View file
drivers/media/pci/saa7134/Makefile	modified	+2	−0	View file
drivers/media/pci/saa7134/saa7134-cards.c	modified	+29	−0	View file
drivers/media/pci/saa7134/saa7134-core.c	modified	+8	−2	View file
drivers/media/pci/saa7134/saa7134-go7007.c	added	+531	−0	View file
drivers/media/pci/saa7134/saa7134-vbi.c	modified	+1	−1	View file
drivers/media/pci/saa7134/saa7134-video.c	modified	+1	−1	View file
drivers/media/pci/saa7134/saa7134.h	modified	+5	−0	View file
drivers/media/pci/saa7164/saa7164-api.c	modified	+1	−2	View file
drivers/media/pci/saa7164/saa7164-core.c	modified	+3	−3	View file
drivers/media/pci/solo6x10/Kconfig	modified	+1	−0	View file
drivers/media/pci/solo6x10/solo6x10-disp.c	modified	+2	−2	View file
drivers/media/pci/solo6x10/solo6x10-eeprom.c	modified	+4	−4	View file
drivers/media/pci/solo6x10/solo6x10.h	modified	+2	−2	View file
drivers/media/pci/sta2x11/Kconfig	modified	+1	−0	View file
drivers/media/pci/sta2x11/sta2x11_vip.c	modified	+1	−1	View file
drivers/media/pci/ttpci/Kconfig	modified	+4	−0	View file
drivers/media/pci/ttpci/Makefile	modified	+1	−1	View file
drivers/media/pci/ttpci/av7110.c	modified	+4	−4	View file
drivers/media/pci/tw68/Kconfig	added	+10	−0	View file
drivers/media/pci/tw68/Makefile	added	+3	−0	View file
drivers/media/pci/tw68/tw68-core.c	added	+434	−0	View file
drivers/media/pci/tw68/tw68-reg.h	added	+195	−0	View file
drivers/media/pci/tw68/tw68-risc.c	added	+230	−0	View file
drivers/media/pci/tw68/tw68-video.c	added	+1051	−0	View file
drivers/media/pci/tw68/tw68.h	added	+231	−0	View file
drivers/media/pci/zoran/zoran_device.c	modified	+1	−1	View file
drivers/media/platform/Kconfig	modified	+32	−22	View file
drivers/media/platform/Makefile	modified	+3	−5	View file
drivers/media/platform/blackfin/Kconfig	modified	+1	−0	View file
drivers/media/platform/coda.c	deleted	+0	−3933	View before deletion
drivers/media/platform/coda/Makefile	added	+3	−0	View file
drivers/media/platform/coda/coda-bit.c	added	+1861	−0	View file
drivers/media/platform/coda/coda-common.c	added	+2052	−0	View file
drivers/media/platform/coda/coda-h264.c	added	+37	−0	View file
drivers/media/platform/coda/coda.h	added	+287	−0	View file
drivers/media/platform/coda.h → drivers/media/platform/coda/coda_regs.h	renamed	+0	−0	View file
drivers/media/platform/davinci/Kconfig	modified	+14	−4	View file
drivers/media/platform/davinci/dm355_ccdc.c	modified	+1	−1	View file
drivers/media/platform/davinci/dm644x_ccdc.c	modified	+7	−7	View file
drivers/media/platform/davinci/vpfe_capture.c	modified	+7	−9	View file
drivers/media/platform/davinci/vpif.c	modified	+1	−0	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+3	−10	View file
drivers/media/platform/davinci/vpif_display.c	modified	+6	−16	View file
drivers/media/platform/exynos-gsc/gsc-core.c	modified	+3	−3	View file
drivers/media/platform/exynos-gsc/gsc-m2m.c	modified	+0	−3	View file
drivers/media/platform/exynos-gsc/gsc-regs.c	modified	+4	−4	View file
drivers/media/platform/exynos4-is/Kconfig	modified	+4	−1	View file
drivers/media/platform/exynos4-is/fimc-is-errno.c	modified	+2	−2	View file
drivers/media/platform/exynos4-is/fimc-is-errno.h	modified	+2	−2	View file
drivers/media/platform/exynos4-is/fimc-is-param.c	modified	+0	−2	View file
drivers/media/platform/exynos4-is/fimc-is.c	modified	+5	−5	View file
drivers/media/platform/exynos4-is/fimc-isp-video.c	modified	+4	−5	View file
drivers/media/platform/exynos4-is/media-dev.c	modified	+3	−1	View file
drivers/media/platform/exynos4-is/mipi-csis.c	modified	+2	−1	View file
drivers/media/platform/marvell-ccic/Kconfig	modified	+2	−0	View file
drivers/media/platform/marvell-ccic/mcam-core.c	modified	+1	−1	View file
drivers/media/platform/mx2_emmaprp.c	modified	+1	−1	View file
drivers/media/platform/omap/Kconfig	modified	+1	−1	View file
drivers/media/platform/omap/omap_vout.c	modified	+6	−10	View file
drivers/media/platform/omap/omap_vout_vrfb.c	modified	+5	−5	View file
drivers/media/platform/omap/omap_vout_vrfb.h	modified	+9	−9	View file
drivers/media/platform/omap3isp/cfa_coef_table.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/gamma_table.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/isp.c	modified	+4	−16	View file
drivers/media/platform/omap3isp/isp.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispccdc.c	modified	+293	−131	View file
drivers/media/platform/omap3isp/ispccdc.h	modified	+11	−10	View file
drivers/media/platform/omap3isp/ispccp2.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispccp2.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispcsi2.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispcsi2.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispcsiphy.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispcsiphy.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/isph3a.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/isph3a_aewb.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/isph3a_af.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/isphist.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/isphist.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/isppreview.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/isppreview.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispreg.h	modified	+3	−17	View file
drivers/media/platform/omap3isp/ispresizer.c	modified	+45	−35	View file
drivers/media/platform/omap3isp/ispresizer.h	modified	+3	−10	View file
drivers/media/platform/omap3isp/ispstat.c	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispstat.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/ispvideo.c	modified	+45	−14	View file
drivers/media/platform/omap3isp/ispvideo.h	modified	+2	−10	View file
drivers/media/platform/omap3isp/luma_enhance_table.h	modified	+0	−10	View file
drivers/media/platform/omap3isp/noise_filter_table.h	modified	+0	−10	View file
drivers/media/platform/s3c-camif/camif-capture.c	modified	+2	−2	View file
drivers/media/platform/s3c-camif/camif-regs.c	modified	+2	−2	View file
drivers/media/platform/s5p-g2d/g2d.c	modified	+3	−4	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+1	−1	View file
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c	modified	+2	−0	View file
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c	modified	+4	−7	View file
drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c	modified	+2	−4	View file
drivers/media/platform/s5p-mfc/s5p_mfc.c	modified	+43	−40	View file
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c	modified	+1	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c	modified	+1	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc_common.h	modified	+6	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c	modified	+14	−13	View file
drivers/media/platform/s5p-mfc/s5p_mfc_debug.h	modified	+3	−3	View file
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	modified	+18	−36	View file
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	modified	+23	−44	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr.c	modified	+2	−2	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h	modified	+244	−244	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c	modified	+15	−16	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c	modified	+243	−248	View file
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c	modified	+1	−1	View file
drivers/media/platform/s5p-tv/Kconfig	modified	+3	−1	View file
drivers/media/platform/s5p-tv/hdmi_drv.c	modified	+1	−1	View file
drivers/media/platform/s5p-tv/sdo_drv.c	modified	+1	−1	View file
drivers/media/platform/s5p-tv/sii9234_drv.c	modified	+1	−1	View file
drivers/media/platform/sh_veu.c	modified	+1	−3	View file
drivers/media/platform/soc_camera/Kconfig	modified	+13	−3	View file
drivers/media/platform/soc_camera/atmel-isi.c	modified	+6	−7	View file
drivers/media/platform/soc_camera/mx2_camera.c	modified	+2	−3	View file
drivers/media/platform/soc_camera/pxa_camera.c	modified	+1	−1	View file
drivers/media/platform/soc_camera/rcar_vin.c	modified	+2	−2	View file
drivers/media/platform/soc_camera/soc_camera.c	modified	+18	−3	View file
drivers/media/platform/ti-vpe/vpdma.c	modified	+2	−2	View file
drivers/media/platform/ti-vpe/vpe.c	modified	+10	−10	View file
drivers/media/platform/via-camera.c	modified	+3	−10	View file
drivers/media/platform/vivi.c	deleted	+0	−1542	View before deletion
drivers/media/platform/vivid/Kconfig	added	+19	−0	View file
drivers/media/platform/vivid/Makefile	added	+6	−0	View file
drivers/media/platform/vivid/vivid-core.c	added	+1390	−0	View file
drivers/media/platform/vivid/vivid-core.h	added	+520	−0	View file
drivers/media/platform/vivid/vivid-ctrls.c	added	+1502	−0	View file
drivers/media/platform/vivid/vivid-ctrls.h	added	+34	−0	View file
drivers/media/platform/vivid/vivid-kthread-cap.c	added	+886	−0	View file
drivers/media/platform/vivid/vivid-kthread-cap.h	added	+26	−0	View file
drivers/media/platform/vivid/vivid-kthread-out.c	added	+305	−0	View file
drivers/media/platform/vivid/vivid-kthread-out.h	added	+26	−0	View file
drivers/media/platform/vivid/vivid-osd.c	added	+400	−0	View file
drivers/media/platform/vivid/vivid-osd.h	added	+27	−0	View file
drivers/media/platform/vivid/vivid-radio-common.c	added	+189	−0	View file
drivers/media/platform/vivid/vivid-radio-common.h	added	+40	−0	View file
drivers/media/platform/vivid/vivid-radio-rx.c	added	+287	−0	View file
drivers/media/platform/vivid/vivid-radio-rx.h	added	+31	−0	View file
drivers/media/platform/vivid/vivid-radio-tx.c	added	+141	−0	View file
drivers/media/platform/vivid/vivid-radio-tx.h	added	+29	−0	View file
drivers/media/platform/vivid/vivid-rds-gen.c	added	+166	−0	View file
drivers/media/platform/vivid/vivid-rds-gen.h	added	+53	−0	View file
drivers/media/platform/vivid/vivid-sdr-cap.c	added	+499	−0	View file
drivers/media/platform/vivid/vivid-sdr-cap.h	added	+34	−0	View file
drivers/media/platform/vivid/vivid-tpg-colors.c	added	+310	−0	View file
drivers/media/platform/vivid/vivid-tpg-colors.h	added	+64	−0	View file
drivers/media/platform/vivid/vivid-tpg.c	added	+1439	−0	View file
drivers/media/platform/vivid/vivid-tpg.h	added	+439	−0	View file
drivers/media/platform/vivid/vivid-vbi-cap.c	added	+371	−0	View file
drivers/media/platform/vivid/vivid-vbi-cap.h	added	+40	−0	View file
drivers/media/platform/vivid/vivid-vbi-gen.c	added	+323	−0	View file
drivers/media/platform/vivid/vivid-vbi-gen.h	added	+33	−0	View file
drivers/media/platform/vivid/vivid-vbi-out.c	added	+248	−0	View file
drivers/media/platform/vivid/vivid-vbi-out.h	added	+34	−0	View file
drivers/media/platform/vivid/vivid-vid-cap.c	added	+1730	−0	View file
drivers/media/platform/vivid/vivid-vid-cap.h	added	+71	−0	View file
drivers/media/platform/vivid/vivid-vid-common.c	added	+571	−0	View file
drivers/media/platform/vivid/vivid-vid-common.h	added	+61	−0	View file
drivers/media/platform/vivid/vivid-vid-out.c	added	+1146	−0	View file
drivers/media/platform/vivid/vivid-vid-out.h	added	+56	−0	View file
drivers/media/radio/radio-gemtek.c	modified	+1	−1	View file
drivers/media/radio/radio-sf16fmi.c	modified	+3	−3	View file
drivers/media/radio/radio-sf16fmr2.c	modified	+2	−2	View file
drivers/media/radio/radio-tea5764.c	modified	+6	−6	View file
drivers/media/radio/si470x/radio-si470x-common.c	modified	+2	−2	View file
drivers/media/radio/si470x/radio-si470x-usb.c	modified	+1	−3	View file
drivers/media/radio/wl128x/fmdrv_common.c	modified	+6	−5	View file
drivers/media/radio/wl128x/fmdrv_rx.c	modified	+5	−5	View file
drivers/media/radio/wl128x/fmdrv_tx.c	modified	+1	−1	View file
drivers/media/rc/Kconfig	modified	+13	−2	View file
drivers/media/rc/Makefile	modified	+1	−0	View file
drivers/media/rc/ene_ir.c	modified	+1	−1	View file
drivers/media/rc/fintek-cir.c	modified	+2	−4	View file
drivers/media/rc/img-ir/img-ir-hw.c	modified	+0	−6	View file
drivers/media/rc/img-ir/img-ir-hw.h	modified	+6	−0	View file
drivers/media/rc/imon.c	modified	+206	−98	View file
drivers/media/rc/ir-hix5hd2.c	added	+351	−0	View file
drivers/media/rc/ite-cir.c	modified	+1	−2	View file
drivers/media/rc/keymaps/Makefile	modified	+1	−0	View file
drivers/media/rc/keymaps/rc-dvbsky.c	added	+78	−0	View file
drivers/media/rc/lirc_dev.c	modified	+7	−7	View file
drivers/media/rc/mceusb.c	modified	+10	−5	View file
drivers/media/rc/nuvoton-cir.c	modified	+2	−4	View file
drivers/media/rc/st_rc.c	modified	+7	−9	View file
drivers/media/rc/streamzap.c	modified	+2	−4	View file
drivers/media/tuners/Kconfig	modified	+17	−0	View file
drivers/media/tuners/Makefile	modified	+3	−1	View file
drivers/media/tuners/e4000.c	modified	+34	−41	View file
drivers/media/tuners/it913x.c	added	+478	−0	View file
drivers/media/tuners/tuner_it913x.h → drivers/media/tuners/it913x.h	renamed	+25	−16	View file
drivers/media/tuners/m88ts2022.c	modified	+129	−226	View file
drivers/media/tuners/m88ts2022_priv.h	modified	+3	−2	View file
drivers/media/tuners/msi001.c	modified	+31	−25	View file
drivers/media/tuners/mt2060.c	modified	+1	−2	View file
drivers/media/tuners/mt2063.c	modified	+13	−13	View file
drivers/media/tuners/mxl301rf.c	added	+349	−0	View file
drivers/media/tuners/mxl301rf.h	added	+26	−0	View file
drivers/media/tuners/mxl5005s.c	modified	+1	−2	View file
drivers/media/tuners/qm1d1c0042.c	added	+448	−0	View file
drivers/media/tuners/qm1d1c0042.h	added	+37	−0	View file
drivers/media/tuners/si2157.c	modified	+52	−34	View file
drivers/media/tuners/si2157.h	modified	+1	−1	View file
drivers/media/tuners/si2157_priv.h	modified	+2	−1	View file
drivers/media/tuners/tda18212.c	modified	+108	−164	View file
drivers/media/tuners/tda18212.h	modified	+5	−14	View file
drivers/media/tuners/tda18271-common.c	modified	+8	−11	View file
drivers/media/tuners/tda18271-priv.h	modified	+2	−2	View file
drivers/media/tuners/tuner-xc2028.c	modified	+31	−31	View file
drivers/media/tuners/tuner_it913x.c	deleted	+0	−453	View before deletion
drivers/media/tuners/tuner_it913x_priv.h	deleted	+0	−78	View before deletion
drivers/media/tuners/xc4000.c	modified	+31	−31	View file
drivers/media/tuners/xc5000.c	modified	+162	−80	View file
drivers/media/usb/Kconfig	modified	+3	−1	View file
drivers/media/usb/Makefile	modified	+3	−1	View file
drivers/media/usb/airspy/airspy.c	modified	+100	−122	View file
drivers/staging/media/as102/Kconfig → drivers/media/usb/as102/Kconfig	renamed	+0	−0	View file
drivers/staging/media/as102/Makefile → drivers/media/usb/as102/Makefile	renamed	+2	−1	View file
drivers/staging/media/as102/as102_drv.c → drivers/media/usb/as102/as102_drv.c	renamed	+138	−14	View file
drivers/staging/media/as102/as102_drv.h → drivers/media/usb/as102/as102_drv.h	renamed	+5	−21	View file
drivers/staging/media/as102/as102_fw.c → drivers/media/usb/as102/as102_fw.c	renamed	+0	−4	View file
drivers/staging/media/as102/as102_fw.h → drivers/media/usb/as102/as102_fw.h	renamed	+0	−4	View file
drivers/staging/media/as102/as102_usb_drv.c → drivers/media/usb/as102/as102_usb_drv.c	renamed	+28	−25	View file
drivers/staging/media/as102/as102_usb_drv.h → drivers/media/usb/as102/as102_usb_drv.h	renamed	+0	−4	View file
drivers/staging/media/as102/as10x_cmd.c → drivers/media/usb/as102/as10x_cmd.c	renamed	+9	−14	View file
drivers/staging/media/as102/as10x_cmd.h → drivers/media/usb/as102/as10x_cmd.h	renamed	+51	−57	View file
drivers/staging/media/as102/as10x_cmd_cfg.c → drivers/media/usb/as102/as10x_cmd_cfg.c	renamed	+2	−7	View file
drivers/staging/media/as102/as10x_cmd_stream.c → drivers/media/usb/as102/as10x_cmd_stream.c	renamed	+0	−4	View file
drivers/staging/media/as102/as10x_handle.h → drivers/media/usb/as102/as10x_handle.h	renamed	+2	−5	View file
drivers/media/usb/au0828/au0828-cards.c	modified	+16	−20	View file
drivers/media/usb/au0828/au0828-core.c	modified	+61	−23	View file
drivers/media/usb/au0828/au0828-dvb.c	modified	+74	−36	View file
drivers/media/usb/au0828/au0828-i2c.c	modified	+8	−7	View file
drivers/media/usb/au0828/au0828-input.c	modified	+28	−8	View file
drivers/media/usb/au0828/au0828-vbi.c	modified	+2	−2	View file
drivers/media/usb/au0828/au0828-video.c	modified	+78	−12	View file
drivers/media/usb/au0828/au0828.h	modified	+26	−8	View file
drivers/media/usb/cx231xx/cx231xx-avcore.c	modified	+7	−7	View file
drivers/media/usb/cx231xx/cx231xx-cards.c	modified	+8	−2	View file
drivers/media/usb/cx231xx/cx231xx-core.c	modified	+1	−1	View file
drivers/media/usb/cx231xx/cx231xx-dvb.c	modified	+3	−5	View file
drivers/media/usb/dvb-usb-v2/Kconfig	modified	+7	−0	View file
drivers/media/usb/dvb-usb-v2/Makefile	modified	+3	−0	View file
drivers/media/usb/dvb-usb-v2/af9015.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/af9035.c	modified	+563	−81	View file
drivers/media/usb/dvb-usb-v2/af9035.h	modified	+10	−2	View file
drivers/media/usb/dvb-usb-v2/anysee.c	modified	+149	−36	View file
drivers/media/usb/dvb-usb-v2/anysee.h	modified	+3	−0	View file
drivers/media/usb/dvb-usb-v2/dvb_usb.h	modified	+3	−0	View file
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c	modified	+23	−5	View file
drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/dvbsky.c	added	+460	−0	View file
drivers/media/usb/dvb-usb-v2/lmedm04.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb-v2/mxl111sf.c	modified	+4	−4	View file
drivers/media/usb/dvb-usb/Kconfig	modified	+1	−1	View file
drivers/media/usb/dvb-usb/af9005.c	modified	+1	−1	View file
drivers/media/usb/dvb-usb/cxusb.c	modified	+128	−2	View file
drivers/media/usb/dvb-usb/cxusb.h	modified	+4	−0	View file
drivers/media/usb/dvb-usb/dib0700_devices.c	modified	+211	−172	View file
drivers/media/usb/dvb-usb/dibusb-common.c	modified	+6	−6	View file
drivers/media/usb/dvb-usb/dw2102.c	modified	+7	−7	View file
drivers/media/usb/dvb-usb/opera1.c	modified	+2	−2	View file
drivers/media/usb/dvb-usb/pctv452e.c	modified	+4	−4	View file
drivers/media/usb/em28xx/em28xx-audio.c	modified	+5	−5	View file
drivers/media/usb/em28xx/em28xx-cards.c	modified	+17	−26	View file
drivers/media/usb/em28xx/em28xx-core.c	modified	+28	−19	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+30	−7	View file
drivers/media/usb/em28xx/em28xx-input.c	modified	+16	−13	View file
drivers/media/usb/em28xx/em28xx-vbi.c	modified	+0	−11	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+19	−10	View file
drivers/media/usb/em28xx/em28xx.h	modified	+12	−7	View file
drivers/media/usb/go7007/go7007-usb.c	modified	+2	−2	View file
drivers/media/usb/gspca/gspca.c	modified	+2	−3	View file
drivers/media/usb/gspca/gspca.h	modified	+1	−1	View file
drivers/media/usb/gspca/kinect.c	modified	+6	−6	View file
drivers/media/usb/gspca/sn9c20x.c	modified	+7	−5	View file
drivers/media/usb/hackrf/Kconfig	added	+10	−0	View file
drivers/media/usb/hackrf/Makefile	added	+1	−0	View file
drivers/media/usb/hackrf/hackrf.c	added	+1142	−0	View file
drivers/media/usb/hdpvr/hdpvr-control.c	modified	+6	−15	View file
drivers/media/usb/hdpvr/hdpvr-core.c	modified	+6	−21	View file
drivers/media/usb/msi2500/msi2500.c	modified	+74	−100	View file
drivers/media/usb/pwc/pwc-v4l.c	modified	+1	−1	View file
drivers/media/usb/s2255/s2255drv.c	modified	+1	−1	View file
drivers/media/usb/siano/smsusb.c	modified	+4	−2	View file
drivers/media/usb/ttusb-dec/ttusbdecfe.c	modified	+3	−0	View file
drivers/media/usb/usbtv/Kconfig	modified	+2	−1	View file
drivers/media/usb/usbtv/Makefile	modified	+2	−1	View file
drivers/media/usb/usbtv/usbtv-audio.c	added	+385	−0	View file
drivers/media/usb/usbtv/usbtv-core.c	modified	+13	−4	View file
drivers/media/usb/usbtv/usbtv-video.c	modified	+11	−7	View file
drivers/media/usb/usbtv/usbtv.h	modified	+20	−1	View file
drivers/media/usb/uvc/uvc_ctrl.c	modified	+56	−4	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+19	−1	View file
drivers/media/usb/uvc/uvc_v4l2.c	modified	+1	−0	View file
drivers/media/usb/uvc/uvc_video.c	modified	+8	−2	View file
drivers/media/usb/uvc/uvcvideo.h	modified	+4	−1	View file
drivers/media/v4l2-core/tuner-core.c	modified	+7	−3	View file
drivers/media/v4l2-core/v4l2-common.c	modified	+3	−6	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+19	−11	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+6	−0	View file
drivers/media/v4l2-core/v4l2-dv-timings.c	modified	+2	−1	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+3	−3	View file
drivers/media/v4l2-core/v4l2-subdev.c	modified	+9	−0	View file
drivers/media/v4l2-core/videobuf-core.c	modified	+6	−5	View file
drivers/media/v4l2-core/videobuf-dma-sg.c	modified	+4	−2	View file
drivers/media/v4l2-core/videobuf2-core.c	modified	+28	−38	View file
drivers/staging/media/Kconfig	modified	+0	−2	View file
drivers/staging/media/Makefile	modified	+0	−1	View file
drivers/staging/media/as102/as102_fe.c	deleted	+0	−571	View before deletion
drivers/staging/media/davinci_vpfe/Kconfig	modified	+1	−0	View file
drivers/staging/media/dt3155v4l/Kconfig	modified	+1	−0	View file
drivers/staging/media/lirc/lirc_imon.c	modified	+1	−0	View file
drivers/staging/media/lirc/lirc_sasem.c	modified	+1	−0	View file
drivers/staging/media/omap4iss/Kconfig	modified	+1	−0	View file
include/media/davinci/dm644x_ccdc.h	modified	+1	−1	View file
include/media/omap3isp.h	modified	+3	−0	View file
include/media/rc-map.h	modified	+1	−0	View file
include/media/videobuf2-core.h	modified	+13	−2	View file
include/uapi/linux/Kbuild	modified	+1	−0	View file
include/uapi/linux/smiapp.h	added	+29	−0	View file
include/uapi/linux/v4l2-controls.h	modified	+6	−0	View file
include/uapi/linux/v4l2-dv-timings.h	modified	+0	−9	View file
include/uapi/linux/videodev2.h	modified	+8	−5	View file

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

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 3a626d1..07ffc76 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2566,6 +2566,12 @@ fields changed from _s32 to _u32.
 	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
 	  </para>
         </listitem>
+      <title>V4L2 in Linux 3.18</title>
+      <orderedlist>
+	<listitem>
+	  <para>Added <constant>V4L2_CID_PAN_SPEED</constant> and
+ <constant>V4L2_CID_TILT_SPEED</constant> camera controls.</para>
+	</listitem>
       </orderedlist>
     </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 9f5ffd8..e013e4b 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3965,6 +3965,27 @@ by exposure, white balance or focus controls.</entry>
 	  </row>
 	  <row><entry></entry></row>
 
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_PAN_SPEED</constant>&nbsp;</entry>
+	    <entry>integer</entry>
+	  </row><row><entry spanname="descr">This control turns the
+camera horizontally at the specific speed. The unit is undefined. A
+positive value moves the camera to the right (clockwise when viewed
+from above), a negative value to the left. A value of zero stops the motion
+if one is in progress and has no effect otherwise.</entry>
+	  </row>
+	  <row><entry></entry></row>
+
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_TILT_SPEED</constant>&nbsp;</entry>
+	    <entry>integer</entry>
+	  </row><row><entry spanname="descr">This control turns the
+camera vertically at the specified speed. The unit is undefined. A
+positive value moves the camera up, a negative value down. A value of zero
+stops the motion if one is in progress and has no effect otherwise.</entry>
+	  </row>
+	  <row><entry></entry></row>
+
 	</tbody>
       </tgroup>
     </table>
@@ -4790,6 +4811,40 @@ interface and may change in the future.</para>
 	    conversion.
 	    </entry>
 	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_RED</constant></entry>
+	    <entry>integer</entry>
+	  </row>
+	  <row>
+	    <entry spanname="descr">Test pattern red colour component.
+	    </entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENR</constant></entry>
+	    <entry>integer</entry>
+	  </row>
+	  <row>
+	    <entry spanname="descr">Test pattern green (next to red)
+	    colour component.
+	    </entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_BLUE</constant></entry>
+	    <entry>integer</entry>
+	  </row>
+	  <row>
+	    <entry spanname="descr">Test pattern blue colour component.
+	    </entry>
+	  </row>
+	  <row>
+	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENB</constant></entry>
+	    <entry>integer</entry>
+	  </row>
+	  <row>
+	    <entry spanname="descr">Test pattern green (next to blue)
+	    colour component.
+	    </entry>
+	  </row>
 	  <row><entry></entry></row>
 	</tbody>
       </tgroup>

Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml

View file

diff --git a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
index 2aae8e9..6ab4f0f 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
@@ -237,9 +237,9 @@ for a pixel lie next to each other in memory.</para>
 	    <entry>g<subscript>4</subscript></entry>
 	    <entry>g<subscript>3</subscript></entry>
 	  </row>
-	  <row id="V4L2-PIX-FMT-RGB555X">
-	    <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
-	    <entry>'RGBQ'</entry>
+	  <row id="V4L2-PIX-FMT-ARGB555X">
+	    <entry><constant>V4L2_PIX_FMT_ARGB555X</constant></entry>
+	    <entry>'AR15' | (1 &lt;&lt; 31)</entry>
 	    <entry></entry>
 	    <entry>a</entry>
 	    <entry>r<subscript>4</subscript></entry>
@@ -259,6 +259,28 @@ for a pixel lie next to each other in memory.</para>
 	    <entry>b<subscript>1</subscript></entry>
 	    <entry>b<subscript>0</subscript></entry>
 	  </row>
+	  <row id="V4L2-PIX-FMT-XRGB555X">
+	    <entry><constant>V4L2_PIX_FMT_XRGB555X</constant></entry>
+	    <entry>'XR15' | (1 &lt;&lt; 31)</entry>
+	    <entry></entry>
+	    <entry>-</entry>
+	    <entry>r<subscript>4</subscript></entry>
+	    <entry>r<subscript>3</subscript></entry>
+	    <entry>r<subscript>2</subscript></entry>
+	    <entry>r<subscript>1</subscript></entry>
+	    <entry>r<subscript>0</subscript></entry>
+	    <entry>g<subscript>4</subscript></entry>
+	    <entry>g<subscript>3</subscript></entry>
+	    <entry></entry>
+	    <entry>g<subscript>2</subscript></entry>
+	    <entry>g<subscript>1</subscript></entry>
+	    <entry>g<subscript>0</subscript></entry>
+	    <entry>b<subscript>4</subscript></entry>
+	    <entry>b<subscript>3</subscript></entry>
+	    <entry>b<subscript>2</subscript></entry>
+	    <entry>b<subscript>1</subscript></entry>
+	    <entry>b<subscript>0</subscript></entry>
+	  </row>
 	  <row id="V4L2-PIX-FMT-RGB565X">
 	    <entry><constant>V4L2_PIX_FMT_RGB565X</constant></entry>
 	    <entry>'RGBR'</entry>
@@ -464,7 +486,7 @@ for a pixel lie next to each other in memory.</para>
 	  </row>
 	  <row id="V4L2-PIX-FMT-ARGB32">
 	    <entry><constant>V4L2_PIX_FMT_ARGB32</constant></entry>
-	    <entry>'AX24'</entry>
+	    <entry>'BA24'</entry>
 	    <entry></entry>
 	    <entry>a<subscript>7</subscript></entry>
 	    <entry>a<subscript>6</subscript></entry>
@@ -800,6 +822,28 @@ image</title>
 	    <entry>g<subscript>4</subscript></entry>
 	    <entry>g<subscript>3</subscript></entry>
 	  </row>
+	  <row id="V4L2-PIX-FMT-RGB555X">
+	    <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
+	    <entry>'RGBQ'</entry>
+	    <entry></entry>
+	    <entry>a</entry>
+	    <entry>r<subscript>4</subscript></entry>
+	    <entry>r<subscript>3</subscript></entry>
+	    <entry>r<subscript>2</subscript></entry>
+	    <entry>r<subscript>1</subscript></entry>
+	    <entry>r<subscript>0</subscript></entry>
+	    <entry>g<subscript>4</subscript></entry>
+	    <entry>g<subscript>3</subscript></entry>
+	    <entry></entry>
+	    <entry>g<subscript>2</subscript></entry>
+	    <entry>g<subscript>1</subscript></entry>
+	    <entry>g<subscript>0</subscript></entry>
+	    <entry>b<subscript>4</subscript></entry>
+	    <entry>b<subscript>3</subscript></entry>
+	    <entry>b<subscript>2</subscript></entry>
+	    <entry>b<subscript>1</subscript></entry>
+	    <entry>b<subscript>0</subscript></entry>
+	  </row>
 	  <row id="V4L2-PIX-FMT-BGR32">
 	    <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>
 	    <entry>'BGR4'</entry>

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

View file

diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
index cb77325..b036f89 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
@@ -76,21 +76,22 @@
 	    <entry></entry>
 	    <entry>&v4l2-event-vsync;</entry>
             <entry><structfield>vsync</structfield></entry>
-	    <entry>Event data for event V4L2_EVENT_VSYNC.
+	    <entry>Event data for event <constant>V4L2_EVENT_VSYNC</constant>.
             </entry>
 	  </row>
 	  <row>
 	    <entry></entry>
 	    <entry>&v4l2-event-ctrl;</entry>
             <entry><structfield>ctrl</structfield></entry>
-	    <entry>Event data for event V4L2_EVENT_CTRL.
+	    <entry>Event data for event <constant>V4L2_EVENT_CTRL</constant>.
             </entry>
 	  </row>
 	  <row>
 	    <entry></entry>
 	    <entry>&v4l2-event-frame-sync;</entry>
             <entry><structfield>frame_sync</structfield></entry>
-	    <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>
+	    <entry>Event data for event
+	    <constant>V4L2_EVENT_FRAME_SYNC</constant>.</entry>
 	  </row>
 	  <row>
 	    <entry></entry>

Documentation/DocBook/media/v4l/vidioc-g-edid.xml

View file

diff --git a/Documentation/DocBook/media/v4l/vidioc-g-edid.xml b/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
index ce4563b..6df40db 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
@@ -24,7 +24,7 @@
 	<funcdef>int <function>ioctl</function></funcdef>
 	<paramdef>int <parameter>fd</parameter></paramdef>
 	<paramdef>int <parameter>request</parameter></paramdef>
-	<paramdef>const struct v4l2_edid *<parameter>argp</parameter></paramdef>
+	<paramdef>struct v4l2_edid *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
@@ -125,17 +125,17 @@
 	    <structfield>blocks</structfield> is 0, then the EDID is disabled or erased.</entry>
 	  </row>
 	  <row>
-	    <entry>__u8&nbsp;*</entry>
-	    <entry><structfield>edid</structfield></entry>
-	    <entry>Pointer to memory that contains the EDID. The minimum size is
-	    <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>
-	  </row>
-	  <row>
 	    <entry>__u32</entry>
 	    <entry><structfield>reserved</structfield>[5]</entry>
 	    <entry>Reserved for future extensions. Applications and drivers must
 	    set the array to zero.</entry>
 	  </row>
+	  <row>
+	    <entry>__u8&nbsp;*</entry>
+	    <entry><structfield>edid</structfield></entry>
+	    <entry>Pointer to memory that contains the EDID. The minimum size is
+	    <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>

Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml

View file

diff --git a/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml b/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
index 9f60956..d7c9365 100644
--- a/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
@@ -176,7 +176,7 @@
 	  </row>
 	  <row>
 	    <entry><constant>V4L2_EVENT_MOTION_DET</constant></entry>
-	    <entry>5</entry>
+	    <entry>6</entry>
 	    <entry>
 	      <para>Triggered whenever the motion detection state for one or more of the regions
 	      changes. This event has a &v4l2-event-motion-det; associated with it.</para>

Documentation/devicetree/bindings/media/hix5hd2-ir.txt

View file

diff --git a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
new file mode 100644
index 0000000..fb5e760
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
@@ -0,0 +1,25 @@
+Device-Tree bindings for hix5hd2 ir IP
+
+Required properties:
+	- compatible: Should contain "hisilicon,hix5hd2-ir".
+	- reg: Base physical address of the controller and length of memory
+	  mapped region.
+	- interrupts: interrupt-specifier for the sole interrupt generated by
+	  the device. The interrupt specifier format depends on the interrupt
+	  controller parent.
+	- clocks: clock phandle and specifier pair.
+	- hisilicon,power-syscon: phandle of syscon used to control power.
+
+Optional properties:
+	- linux,rc-map-name : Remote control map name.
+
+Example node:
+
+	ir: ir@f8001000 {
+		compatible = "hisilicon,hix5hd2-ir";
+		reg = <0xf8001000 0x1000>;
+		interrupts = <0 47 4>;
+		clocks = <&clock HIX5HD2_FIXED_24M>;
+		hisilicon,power-syscon = <&sysctrl>;
+		linux,rc-map-name = "rc-tivo";
+	};

Documentation/dvb/get_dvb_firmware

View file

diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 26c623d..91b43d2 100755
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -708,23 +708,25 @@ sub drxk_terratec_htc_stick {
 }
 
 sub it9135 {
-	my $sourcefile = "dvb-usb-it9135.zip";
-	my $url = "http://www.ite.com.tw/uploads/firmware/v3.6.0.0/$sourcefile";
-	my $hash = "1e55f6c8833f1d0ae067c2bb2953e6a9";
-	my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 0);
-	my $outfile = "dvb-usb-it9135.fw";
+	my $url = "http://www.ite.com.tw/uploads/firmware/v3.25.0.0/";
+	my $file1 = "dvb-usb-it9135-01.zip";
 	my $fwfile1 = "dvb-usb-it9135-01.fw";
+	my $hash1 = "02fcf11174eda84745dae7e61c5ff9ba";
+	my $file2 = "dvb-usb-it9135-02.zip";
 	my $fwfile2 = "dvb-usb-it9135-02.fw";
+	my $hash2 = "d5e1437dc24358578e07999475d4cac9";
 
 	checkstandard();
 
-	wgetfile($sourcefile, $url);
-	unzip($sourcefile, $tmpdir);
-	verify("$tmpdir/$outfile", $hash);
-	extract("$tmpdir/$outfile", 64, 8128, "$fwfile1");
-	extract("$tmpdir/$outfile", 12866, 5817, "$fwfile2");
+	wgetfile($file1, $url . $file1);
+	unzip($file1, "");
+	verify("$fwfile1", $hash1);
+
+	wgetfile($file2, $url . $file2);
+	unzip($file2, "");
+	verify("$fwfile2", $hash2);
 
-	"$fwfile1 $fwfile2"
+	"$file1 $file2"
 }
 
 sub tda10071 {

Documentation/video4linux/vivid.txt

View file

diff --git a/Documentation/video4linux/vivid.txt b/Documentation/video4linux/vivid.txt
new file mode 100644
index 0000000..eeb11a2
--- /dev/null
+++ b/Documentation/video4linux/vivid.txt
@@ -0,0 +1,1111 @@
+vivid: Virtual Video Test Driver
+================================
+
+This driver emulates video4linux hardware of various types: video capture, video
+output, vbi capture and output, radio receivers and transmitters and a software
+defined radio receiver. In addition a simple framebuffer device is available for
+testing capture and output overlays.
+
+Up to 64 vivid instances can be created, each with up to 16 inputs and 16 outputs.
+
+Each input can be a webcam, TV capture device, S-Video capture device or an HDMI
+capture device. Each output can be an S-Video output device or an HDMI output
+device.
+
+These inputs and outputs act exactly as a real hardware device would behave. This
+allows you to use this driver as a test input for application development, since
+you can test the various features without requiring special hardware.
+
+This document describes the features implemented by this driver:
+
+- Support for read()/write(), MMAP, USERPTR and DMABUF streaming I/O.
+- A large list of test patterns and variations thereof
+- Working brightness, contrast, saturation and hue controls
+- Support for the alpha color component
+- Full colorspace support, including limited/full RGB range
+- All possible control types are present
+- Support for various pixel aspect ratios and video aspect ratios
+- Error injection to test what happens if errors occur
+- Supports crop/compose/scale in any combination for both input and output
+- Can emulate up to 4K resolutions
+- All Field settings are supported for testing interlaced capturing
+- Supports all standard YUV and RGB formats, including two multiplanar YUV formats
+- Raw and Sliced VBI capture and output support
+- Radio receiver and transmitter support, including RDS support
+- Software defined radio (SDR) support
+- Capture and output overlay support
+
+These features will be described in more detail below.
+
+
+Table of Contents
+-----------------
+
+Section 1: Configuring the driver
+Section 2: Video Capture
+Section 2.1: Webcam Input
+Section 2.2: TV and S-Video Inputs
+Section 2.3: HDMI Input
+Section 3: Video Output
+Section 3.1: S-Video Output
+Section 3.2: HDMI Output
+Section 4: VBI Capture
+Section 5: VBI Output
+Section 6: Radio Receiver
+Section 7: Radio Transmitter
+Section 8: Software Defined Radio Receiver
+Section 9: Controls
+Section 9.1: User Controls - Test Controls
+Section 9.2: User Controls - Video Capture
+Section 9.3: User Controls - Audio
+Section 9.4: Vivid Controls
+Section 9.4.1: Test Pattern Controls
+Section 9.4.2: Capture Feature Selection Controls
+Section 9.4.3: Output Feature Selection Controls
+Section 9.4.4: Error Injection Controls
+Section 9.4.5: VBI Raw Capture Controls
+Section 9.5: Digital Video Controls
+Section 9.6: FM Radio Receiver Controls
+Section 9.7: FM Radio Modulator
+Section 10: Video, VBI and RDS Looping
+Section 10.1: Video and Sliced VBI looping
+Section 10.2: Radio & RDS Looping
+Section 11: Cropping, Composing, Scaling
+Section 12: Formats
+Section 13: Capture Overlay
+Section 14: Output Overlay
+Section 15: Some Future Improvements
+
+
+Section 1: Configuring the driver
+---------------------------------
+
+By default the driver will create a single instance that has a video capture
+device with webcam, TV, S-Video and HDMI inputs, a video output device with
+S-Video and HDMI outputs, one vbi capture device, one vbi output device, one
+radio receiver device, one radio transmitter device and one SDR device.
+
+The number of instances, devices, video inputs and outputs and their types are
+all configurable using the following module options:
+
+n_devs: number of driver instances to create. By default set to 1. Up to 64
+	instances can be created.
+
+node_types: which devices should each driver instance create. An array of
+	hexadecimal values, one for each instance. The default is 0x1d3d.
+	Each value is a bitmask with the following meaning:
+		bit 0: Video Capture node
+		bit 2-3: VBI Capture node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both
+		bit 4: Radio Receiver node
+		bit 5: Software Defined Radio Receiver node
+		bit 8: Video Output node
+		bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both
+		bit 12: Radio Transmitter node
+		bit 16: Framebuffer for testing overlays
+
+	So to create four instances, the first two with just one video capture
+	device, the second two with just one video output device you would pass
+	these module options to vivid:
+
+		n_devs=4 node_types=0x1,0x1,0x100,0x100
+
+num_inputs: the number of inputs, one for each instance. By default 4 inputs
+	are created for each video capture device. At most 16 inputs can be created,
+	and there must be at least one.
+
+input_types: the input types for each instance, the default is 0xe4. This defines
+	what the type of each input is when the inputs are created for each driver
+	instance. This is a hexadecimal value with up to 16 pairs of bits, each
+	pair gives the type and bits 0-1 map to input 0, bits 2-3 map to input 1,
+	30-31 map to input 15. Each pair of bits has the following meaning:
+
+		00: this is a webcam input
+		01: this is a TV tuner input
+		10: this is an S-Video input
+		11: this is an HDMI input
+
+	So to create a video capture device with 8 inputs where input 0 is a TV
+	tuner, inputs 1-3 are S-Video inputs and inputs 4-7 are HDMI inputs you
+	would use the following module options:
+
+		num_inputs=8 input_types=0xffa9
+
+num_outputs: the number of outputs, one for each instance. By default 2 outputs
+	are created for each video output device. At most 16 outputs can be
+	created, and there must be at least one.
+
+output_types: the output types for each instance, the default is 0x02. This defines
+	what the type of each output is when the outputs are created for each
+	driver instance. This is a hexadecimal value with up to 16 bits, each bit
+	gives the type and bit 0 maps to output 0, bit 1 maps to output 1, bit
+	15 maps to output 15. The meaning of each bit is as follows:
+
+		0: this is an S-Video output
+		1: this is an HDMI output
+
+	So to create a video output device with 8 outputs where outputs 0-3 are
+	S-Video outputs and outputs 4-7 are HDMI outputs you would use the
+	following module options:
+
+		num_outputs=8 output_types=0xf0
+
+vid_cap_nr: give the desired videoX start number for each video capture device.
+	The default is -1 which will just take the first free number. This allows
+	you to map capture video nodes to specific videoX device nodes. Example:
+
+		n_devs=4 vid_cap_nr=2,4,6,8
+
+	This will attempt to assign /dev/video2 for the video capture device of
+	the first vivid instance, video4 for the next up to video8 for the last
+	instance. If it can't succeed, then it will just take the next free
+	number.
+
+vid_out_nr: give the desired videoX start number for each video output device.
+        The default is -1 which will just take the first free number.
+
+vbi_cap_nr: give the desired vbiX start number for each vbi capture device.
+        The default is -1 which will just take the first free number.
+
+vbi_out_nr: give the desired vbiX start number for each vbi output device.
+        The default is -1 which will just take the first free number.
+
+radio_rx_nr: give the desired radioX start number for each radio receiver device.
+        The default is -1 which will just take the first free number.
+
+radio_tx_nr: give the desired radioX start number for each radio transmitter
+	device. The default is -1 which will just take the first free number.
+
+sdr_cap_nr: give the desired swradioX start number for each SDR capture device.
+        The default is -1 which will just take the first free number.
+
+ccs_cap_mode: specify the allowed video capture crop/compose/scaling combination
+	for each driver instance. Video capture devices can have any combination
+	of cropping, composing and scaling capabilities and this will tell the
+	vivid driver which of those is should emulate. By default the user can
+	select this through controls.
+
+	The value is either -1 (controlled by the user) or a set of three bits,
+	each enabling (1) or disabling (0) one of the features:
+
+		bit 0: Enable crop support. Cropping will take only part of the
+		       incoming picture.
+		bit 1: Enable compose support. Composing will copy the incoming
+		       picture into a larger buffer.
+		bit 2: Enable scaling support. Scaling can scale the incoming
+		       picture. The scaler of the vivid driver can enlarge up
+		       or down to four times the original size. The scaler is
+		       very simple and low-quality. Simplicity and speed were
+		       key, not quality.
+
+	Note that this value is ignored by webcam inputs: those enumerate
+	discrete framesizes and that is incompatible with cropping, composing
+	or scaling.
+
+ccs_out_mode: specify the allowed video output crop/compose/scaling combination
+	for each driver instance. Video output devices can have any combination
+	of cropping, composing and scaling capabilities and this will tell the
+	vivid driver which of those is should emulate. By default the user can
+	select this through controls.
+
+	The value is either -1 (controlled by the user) or a set of three bits,
+	each enabling (1) or disabling (0) one of the features:
+
+		bit 0: Enable crop support. Cropping will take only part of the
+		       outgoing buffer.
+		bit 1: Enable compose support. Composing will copy the incoming
+		       buffer into a larger picture frame.
+		bit 2: Enable scaling support. Scaling can scale the incoming
+		       buffer. The scaler of the vivid driver can enlarge up
+		       or down to four times the original size. The scaler is
+		       very simple and low-quality. Simplicity and speed were
+		       key, not quality.
+
+multiplanar: select whether each device instance supports multi-planar formats,
+	and thus the V4L2 multi-planar API. By default the first device instance
+	is single-planar, the second multi-planar, and it keeps alternating.
+
+	This module option can override that for each instance. Values are:
+
+		0: use alternating single and multi-planar devices.
+		1: this is a single-planar instance.
+		2: this is a multi-planar instance.
+
+vivid_debug: enable driver debugging info
+
+no_error_inj: if set disable the error injecting controls. This option is
+	needed in order to run a tool like v4l2-compliance. Tools like that
+	exercise all controls including a control like 'Disconnect' which
+	emulates a USB disconnect, making the device inaccessible and so
+	all tests that v4l2-compliance is doing will fail afterwards.
+
+	There may be other situations as well where you want to disable the
+	error injection support of vivid. When this option is set, then the
+	controls that select crop, compose and scale behavior are also
+	removed. Unless overridden by ccs_cap_mode and/or ccs_out_mode the
+	will default to enabling crop, compose and scaling.
+
+Taken together, all these module options allow you to precisely customize
+the driver behavior and test your application with all sorts of permutations.
+It is also very suitable to emulate hardware that is not yet available, e.g.
+when developing software for a new upcoming device.
+
+
+Section 2: Video Capture
+------------------------
+
+This is probably the most frequently used feature. The video capture device
+can be configured by using the module options num_inputs, input_types and
+ccs_cap_mode (see section 1 for more detailed information), but by default
+four inputs are configured: a webcam, a TV tuner, an S-Video and an HDMI
+input, one input for each input type. Those are described in more detail
+below.
+
+Special attention has been given to the rate at which new frames become
+available. The jitter will be around 1 jiffie (that depends on the HZ
+configuration of your kernel, so usually 1/100, 1/250 or 1/1000 of a second),
+but the long-term behavior is exactly following the framerate. So a
+framerate of 59.94 Hz is really different from 60 Hz. If the framerate
+exceeds your kernel's HZ value, then you will get dropped frames, but the