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

1046a2c4 · Linus Torvalds <[email protected]> · 2011-11-04 07:58:25 -07:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
  [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
  [media] it913x [VER 1.07] Support for single ITE 9135 devices
  [media] Support for Terratec G1
  [media] cx25821: off by one in cx25821_vidioc_s_input()
  [media] media: tea5764: reconcile Kconfig symbol and macro
  [media] omap_vout: Add poll() support
  [media] omap3isp: preview: Add crop support on the sink pad
  [media] omap3isp: preview: Rename min/max input/output sizes defines
  [media] omap3isp: preview: Remove horizontal averager support
  [media] omap3isp: Report the ISP revision through the media controller API
  [media] omap3isp: ccdc: remove redundant operation
  [media] omap3isp: Fix memory leaks in initialization error paths
  [media] omap3isp: Add missing mutex_destroy() calls
  [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
  [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
  [media] MFC: Change MFC firmware binary name
  [media] vb2: add vb2_get_unmapped_area in vb2 core
  [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
  [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
  [media] media: ov6650: stylistic improvements
  ...

Commit: 1046a2c428bedd64c960dcfd0c57cc69a82fea2f
Parents: 46e85f5f · b3f4e1eb

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

Changes

216 files changed · +10316 −3785

File	Status	Add	Del	Content
Documentation/DocBook/media/v4l/compat.xml	modified	+3	−0	View file
Documentation/DocBook/media/v4l/controls.xml	modified	+3	−2	View file
Documentation/DocBook/media/v4l/io.xml	modified	+27	−0	View file
Documentation/DocBook/media/v4l/v4l2.xml	modified	+2	−0	View file
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml	added	+139	−0	View file
Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml	added	+88	−0	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+2	−2	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+1	−1	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+4	−3	View file
arch/sh/boards/mach-ap325rxa/setup.c	modified	+5	−5	View file
arch/sh/boards/mach-migor/setup.c	modified	+1	−3	View file
drivers/dma/ipu/ipu_idmac.c	modified	+42	−23	View file
drivers/media/dvb/ddbridge/Makefile	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/Makefile	modified	+1	−0	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+2	−0	View file
drivers/media/dvb/dvb-usb/it913x.c	modified	+78	−27	View file
drivers/media/dvb/dvb-usb/mxl111sf-demod.c	added	+614	−0	View file
drivers/media/dvb/dvb-usb/mxl111sf-demod.h	added	+55	−0	View file
drivers/media/dvb/dvb-usb/mxl111sf.c	modified	+225	−3	View file
drivers/media/dvb/dvb-usb/mxl111sf.h	modified	+1	−1	View file
drivers/media/dvb/ngene/Makefile	modified	+1	−1	View file
drivers/media/radio/radio-tea5764.c	modified	+3	−1	View file
drivers/media/video/Kconfig	modified	+9	−0	View file
drivers/media/video/Makefile	modified	+2	−0	View file
drivers/media/video/atmel-isi.c	modified	+76	−66	View file
drivers/media/video/cx18/cx18-driver.c	modified	+2	−0	View file
drivers/staging/cx25821/Kconfig → drivers/media/video/cx25821/Kconfig	renamed	+0	−0	View file
drivers/staging/cx25821/Makefile → drivers/media/video/cx25821/Makefile	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-alsa.c → drivers/media/video/cx25821/cx25821-alsa.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-audio-upstream.c → drivers/media/video/cx25821/cx25821-audio-upstream.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-audio-upstream.h → drivers/media/video/cx25821/cx25821-audio-upstream.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-audio.h → drivers/media/video/cx25821/cx25821-audio.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-biffuncs.h → drivers/media/video/cx25821/cx25821-biffuncs.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-cards.c → drivers/media/video/cx25821/cx25821-cards.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-core.c → drivers/media/video/cx25821/cx25821-core.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-gpio.c → drivers/media/video/cx25821/cx25821-gpio.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-i2c.c → drivers/media/video/cx25821/cx25821-i2c.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-medusa-defines.h → drivers/media/video/cx25821/cx25821-medusa-defines.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-medusa-reg.h → drivers/media/video/cx25821/cx25821-medusa-reg.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-medusa-video.c → drivers/media/video/cx25821/cx25821-medusa-video.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-medusa-video.h → drivers/media/video/cx25821/cx25821-medusa-video.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-reg.h → drivers/media/video/cx25821/cx25821-reg.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-sram.h → drivers/media/video/cx25821/cx25821-sram.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-video-upstream-ch2.c → drivers/media/video/cx25821/cx25821-video-upstream-ch2.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-video-upstream-ch2.h → drivers/media/video/cx25821/cx25821-video-upstream-ch2.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-video-upstream.c → drivers/media/video/cx25821/cx25821-video-upstream.c	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-video-upstream.h → drivers/media/video/cx25821/cx25821-video-upstream.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821-video.c → drivers/media/video/cx25821/cx25821-video.c	renamed	+1	−1	View file
drivers/staging/cx25821/cx25821-video.h → drivers/media/video/cx25821/cx25821-video.h	renamed	+0	−0	View file
drivers/staging/cx25821/cx25821.h → drivers/media/video/cx25821/cx25821.h	renamed	+2	−1	View file
drivers/media/video/em28xx/em28xx-cards.c	modified	+2	−0	View file
drivers/media/video/imx074.c	modified	+17	−37	View file
drivers/media/video/ivtv/ivtv-driver.c	modified	+2	−0	View file
drivers/media/video/marvell-ccic/mcam-core.c	modified	+2	−1	View file
drivers/media/video/mem2mem_testdev.c	modified	+4	−3	View file
drivers/media/video/mt9m001.c	modified	+122	−206	View file
drivers/media/video/mt9m111.c	modified	+70	−190	View file
drivers/media/video/mt9t031.c	modified	+141	−206	View file
drivers/media/video/mt9t112.c	modified	+117	−152	View file
drivers/media/video/mt9v022.c	modified	+185	−262	View file
drivers/media/video/mx1_camera.c	modified	+42	−29	View file
drivers/media/video/mx2_camera.c	modified	+45	−33	View file
drivers/media/video/mx3_camera.c	modified	+175	−184	View file
drivers/media/video/omap/omap_vout.c	modified	+10	−0	View file
drivers/media/video/omap1_camera.c	modified	+38	−24	View file
drivers/media/video/omap3isp/isp.c	modified	+3	−0	View file
drivers/media/video/omap3isp/ispccdc.c	modified	+51	−35	View file
drivers/media/video/omap3isp/ispccp2.c	modified	+65	−60	View file
drivers/media/video/omap3isp/ispcsi2.c	modified	+48	−43	View file
drivers/media/video/omap3isp/isph3a_aewb.c	modified	+1	−1	View file
drivers/media/video/omap3isp/isph3a_af.c	modified	+1	−1	View file
drivers/media/video/omap3isp/isphist.c	modified	+1	−1	View file
drivers/media/video/omap3isp/isppreview.c	modified	+269	−150	View file
drivers/media/video/omap3isp/isppreview.h	modified	+2	−7	View file
drivers/media/video/omap3isp/ispreg.h	modified	+0	−3	View file
drivers/media/video/omap3isp/ispresizer.c	modified	+53	−51	View file
drivers/media/video/omap3isp/ispstat.c	modified	+31	−21	View file
drivers/media/video/omap3isp/ispstat.h	modified	+1	−1	View file
drivers/media/video/omap3isp/ispvideo.c	modified	+8	−3	View file
drivers/media/video/omap3isp/ispvideo.h	modified	+1	−0	View file
drivers/media/video/ov2640.c	modified	+52	−126	View file
drivers/media/video/ov5642.c	modified	+181	−107	View file
drivers/media/video/ov6650.c	modified	+173	−331	View file
drivers/media/video/ov772x.c	modified	+69	−129	View file
drivers/media/video/ov9640.c	modified	+60	−126	View file
drivers/media/video/ov9640.h	modified	+1	−3	View file
drivers/media/video/ov9740.c	modified	+55	−96	View file
drivers/media/video/pwc/pwc-if.c	modified	+3	−3	View file
drivers/media/video/pxa_camera.c	modified	+80	−60	View file
drivers/media/video/rj54n1cb0c.c	modified	+75	−148	View file
drivers/media/video/s5k6aa.c	added	+1680	−0	View file
drivers/media/video/s5p-fimc/fimc-capture.c	modified	+3	−3	View file
drivers/media/video/s5p-fimc/fimc-core.c	modified	+3	−3	View file
drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c	modified	+2	−2	View file
drivers/media/video/s5p-mfc/s5p_mfc_dec.c	modified	+4	−3	View file
drivers/media/video/s5p-mfc/s5p_mfc_enc.c	modified	+3	−2	View file
drivers/media/video/s5p-tv/mixer_video.c	modified	+2	−2	View file
drivers/media/video/saa7134/saa7134.h	modified	+6	−6	View file
drivers/media/video/sh_mobile_ceu_camera.c	modified	+285	−206	View file
drivers/media/video/sh_mobile_csi2.c	modified	+84	−48	View file
drivers/media/video/soc_camera.c	modified	+141	−132	View file
drivers/media/video/soc_camera_platform.c	modified	+14	−31	View file
drivers/media/video/soc_mediabus.c	modified	+33	−0	View file
drivers/media/video/tw9910.c	modified	+113	−155	View file
drivers/media/video/v4l2-compat-ioctl32.c	modified	+68	−8	View file
drivers/media/video/v4l2-ctrls.c	modified	+1	−0	View file
drivers/media/video/v4l2-device.c	modified	+31	−5	View file
drivers/media/video/v4l2-ioctl.c	modified	+36	−0	View file
drivers/media/video/videobuf2-core.c	modified	+321	−70	View file
drivers/media/video/vivi.c	modified	+3	−3	View file
drivers/staging/Kconfig	modified	+2	−14	View file
drivers/staging/Makefile	modified	+1	−7	View file
drivers/staging/cx25821/README	deleted	+0	−6	View before deletion
drivers/staging/media/Kconfig	added	+37	−0	View file
drivers/staging/media/Makefile	added	+7	−0	View file
drivers/staging/media/as102/Kconfig	added	+7	−0	View file
drivers/staging/media/as102/Makefile	added	+6	−0	View file
drivers/staging/media/as102/as102_drv.c	added	+351	−0	View file
drivers/staging/media/as102/as102_drv.h	added	+141	−0	View file
drivers/staging/media/as102/as102_fe.c	added	+603	−0	View file
drivers/staging/media/as102/as102_fw.c	added	+251	−0	View file
drivers/staging/media/as102/as102_fw.h	added	+42	−0	View file
drivers/staging/media/as102/as102_usb_drv.c	added	+478	−0	View file
drivers/staging/media/as102/as102_usb_drv.h	added	+59	−0	View file
drivers/staging/media/as102/as10x_cmd.c	added	+452	−0	View file
drivers/staging/media/as102/as10x_cmd.h	added	+540	−0	View file
drivers/staging/media/as102/as10x_cmd_cfg.c	added	+215	−0	View file
drivers/staging/media/as102/as10x_cmd_stream.c	added	+223	−0	View file
drivers/staging/media/as102/as10x_handle.h	added	+58	−0	View file
drivers/staging/media/as102/as10x_types.h	added	+198	−0	View file
drivers/staging/cxd2099/Kconfig → drivers/staging/media/cxd2099/Kconfig	renamed	+0	−0	View file
drivers/staging/cxd2099/Makefile → drivers/staging/media/cxd2099/Makefile	renamed	+0	−0	View file
drivers/staging/cxd2099/TODO → drivers/staging/media/cxd2099/TODO	renamed	+0	−0	View file
drivers/staging/cxd2099/cxd2099.c → drivers/staging/media/cxd2099/cxd2099.c	renamed	+0	−0	View file
drivers/staging/cxd2099/cxd2099.h → drivers/staging/media/cxd2099/cxd2099.h	renamed	+0	−0	View file
drivers/staging/dt3155v4l/Kconfig → drivers/staging/media/dt3155v4l/Kconfig	renamed	+0	−0	View file
drivers/staging/dt3155v4l/Makefile → drivers/staging/media/dt3155v4l/Makefile	renamed	+0	−0	View file
drivers/staging/dt3155v4l/dt3155v4l.c → drivers/staging/media/dt3155v4l/dt3155v4l.c	renamed	+0	−0	View file
drivers/staging/dt3155v4l/dt3155v4l.h → drivers/staging/media/dt3155v4l/dt3155v4l.h	renamed	+0	−0	View file
drivers/staging/easycap/Kconfig → drivers/staging/media/easycap/Kconfig	renamed	+0	−0	View file
drivers/staging/easycap/Makefile → drivers/staging/media/easycap/Makefile	renamed	+0	−0	View file
drivers/staging/easycap/README → drivers/staging/media/easycap/README	renamed	+0	−0	View file
drivers/staging/easycap/easycap.h → drivers/staging/media/easycap/easycap.h	renamed	+0	−0	View file
drivers/staging/easycap/easycap_ioctl.c → drivers/staging/media/easycap/easycap_ioctl.c	renamed	+0	−0	View file
drivers/staging/easycap/easycap_low.c → drivers/staging/media/easycap/easycap_low.c	renamed	+0	−0	View file
drivers/staging/easycap/easycap_main.c → drivers/staging/media/easycap/easycap_main.c	renamed	+0	−0	View file
drivers/staging/easycap/easycap_settings.c → drivers/staging/media/easycap/easycap_settings.c	renamed	+0	−0	View file
drivers/staging/easycap/easycap_sound.c → drivers/staging/media/easycap/easycap_sound.c	renamed	+0	−0	View file
drivers/staging/easycap/easycap_testcard.c → drivers/staging/media/easycap/easycap_testcard.c	renamed	+0	−0	View file
drivers/staging/go7007/Kconfig → drivers/staging/media/go7007/Kconfig	renamed	+0	−0	View file
drivers/staging/go7007/Makefile → drivers/staging/media/go7007/Makefile	renamed	+0	−0	View file
drivers/staging/go7007/README → drivers/staging/media/go7007/README	renamed	+0	−0	View file
drivers/staging/go7007/go7007-driver.c → drivers/staging/media/go7007/go7007-driver.c	renamed	+0	−0	View file
drivers/staging/go7007/go7007-fw.c → drivers/staging/media/go7007/go7007-fw.c	renamed	+0	−0	View file
drivers/staging/go7007/go7007-i2c.c → drivers/staging/media/go7007/go7007-i2c.c	renamed	+0	−0	View file
drivers/staging/go7007/go7007-priv.h → drivers/staging/media/go7007/go7007-priv.h	renamed	+0	−0	View file
drivers/staging/go7007/go7007-usb.c → drivers/staging/media/go7007/go7007-usb.c	renamed	+0	−0	View file
drivers/staging/go7007/go7007-v4l2.c → drivers/staging/media/go7007/go7007-v4l2.c	renamed	+0	−0	View file
drivers/staging/go7007/go7007.h → drivers/staging/media/go7007/go7007.h	renamed	+0	−0	View file
drivers/staging/go7007/go7007.txt → drivers/staging/media/go7007/go7007.txt	renamed	+0	−0	View file
drivers/staging/go7007/s2250-board.c → drivers/staging/media/go7007/s2250-board.c	renamed	+0	−0	View file
drivers/staging/go7007/s2250-loader.c → drivers/staging/media/go7007/s2250-loader.c	renamed	+0	−0	View file
drivers/staging/go7007/s2250-loader.h → drivers/staging/media/go7007/s2250-loader.h	renamed	+0	−0	View file
drivers/staging/go7007/saa7134-go7007.c → drivers/staging/media/go7007/saa7134-go7007.c	renamed	+0	−0	View file
drivers/staging/go7007/snd-go7007.c → drivers/staging/media/go7007/snd-go7007.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-i2c.h → drivers/staging/media/go7007/wis-i2c.h	renamed	+0	−0	View file
drivers/staging/go7007/wis-ov7640.c → drivers/staging/media/go7007/wis-ov7640.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-saa7113.c → drivers/staging/media/go7007/wis-saa7113.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-saa7115.c → drivers/staging/media/go7007/wis-saa7115.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-sony-tuner.c → drivers/staging/media/go7007/wis-sony-tuner.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-tw2804.c → drivers/staging/media/go7007/wis-tw2804.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-tw9903.c → drivers/staging/media/go7007/wis-tw9903.c	renamed	+0	−0	View file
drivers/staging/go7007/wis-uda1342.c → drivers/staging/media/go7007/wis-uda1342.c	renamed	+0	−0	View file
drivers/staging/lirc/Kconfig → drivers/staging/media/lirc/Kconfig	renamed	+0	−0	View file
drivers/staging/lirc/Makefile → drivers/staging/media/lirc/Makefile	renamed	+0	−0	View file
drivers/staging/lirc/TODO → drivers/staging/media/lirc/TODO	renamed	+0	−0	View file
drivers/staging/lirc/TODO.lirc_zilog → drivers/staging/media/lirc/TODO.lirc_zilog	renamed	+0	−0	View file
drivers/staging/lirc/lirc_bt829.c → drivers/staging/media/lirc/lirc_bt829.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_ene0100.h → drivers/staging/media/lirc/lirc_ene0100.h	renamed	+0	−0	View file
drivers/staging/lirc/lirc_igorplugusb.c → drivers/staging/media/lirc/lirc_igorplugusb.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_imon.c → drivers/staging/media/lirc/lirc_imon.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_parallel.c → drivers/staging/media/lirc/lirc_parallel.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_parallel.h → drivers/staging/media/lirc/lirc_parallel.h	renamed	+0	−0	View file
drivers/staging/lirc/lirc_sasem.c → drivers/staging/media/lirc/lirc_sasem.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_serial.c → drivers/staging/media/lirc/lirc_serial.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_sir.c → drivers/staging/media/lirc/lirc_sir.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_ttusbir.c → drivers/staging/media/lirc/lirc_ttusbir.c	renamed	+0	−0	View file
drivers/staging/lirc/lirc_zilog.c → drivers/staging/media/lirc/lirc_zilog.c	renamed	+0	−0	View file
drivers/staging/solo6x10/Kconfig → drivers/staging/media/solo6x10/Kconfig	renamed	+0	−0	View file
drivers/staging/solo6x10/Makefile → drivers/staging/media/solo6x10/Makefile	renamed	+0	−0	View file
drivers/staging/solo6x10/TODO → drivers/staging/media/solo6x10/TODO	renamed	+0	−0	View file
drivers/staging/solo6x10/core.c → drivers/staging/media/solo6x10/core.c	renamed	+0	−0	View file
drivers/staging/solo6x10/disp.c → drivers/staging/media/solo6x10/disp.c	renamed	+0	−0	View file
drivers/staging/solo6x10/enc.c → drivers/staging/media/solo6x10/enc.c	renamed	+0	−0	View file
drivers/staging/solo6x10/g723.c → drivers/staging/media/solo6x10/g723.c	renamed	+0	−0	View file
drivers/staging/solo6x10/gpio.c → drivers/staging/media/solo6x10/gpio.c	renamed	+0	−0	View file
drivers/staging/solo6x10/i2c.c → drivers/staging/media/solo6x10/i2c.c	renamed	+0	−0	View file
drivers/staging/solo6x10/jpeg.h → drivers/staging/media/solo6x10/jpeg.h	renamed	+0	−0	View file
drivers/staging/solo6x10/offsets.h → drivers/staging/media/solo6x10/offsets.h	renamed	+0	−0	View file
drivers/staging/solo6x10/osd-font.h → drivers/staging/media/solo6x10/osd-font.h	renamed	+0	−0	View file
drivers/staging/solo6x10/p2m.c → drivers/staging/media/solo6x10/p2m.c	renamed	+0	−0	View file
drivers/staging/solo6x10/registers.h → drivers/staging/media/solo6x10/registers.h	renamed	+0	−0	View file
drivers/staging/solo6x10/solo6x10.h → drivers/staging/media/solo6x10/solo6x10.h	renamed	+0	−0	View file
drivers/staging/solo6x10/tw28.c → drivers/staging/media/solo6x10/tw28.c	renamed	+0	−0	View file
drivers/staging/solo6x10/tw28.h → drivers/staging/media/solo6x10/tw28.h	renamed	+0	−0	View file
drivers/staging/solo6x10/v4l2-enc.c → drivers/staging/media/solo6x10/v4l2-enc.c	renamed	+0	−0	View file
drivers/staging/solo6x10/v4l2.c → drivers/staging/media/solo6x10/v4l2.c	renamed	+0	−0	View file
include/linux/videodev2.h	modified	+27	−0	View file
include/media/ov772x.h	modified	+12	−14	View file
include/media/s5k6aa.h	added	+51	−0	View file
include/media/soc_camera.h	modified	+31	−73	View file
include/media/soc_camera_platform.h	modified	+3	−1	View file
include/media/soc_mediabus.h	modified	+2	−0	View file
include/media/v4l2-ioctl.h	modified	+2	−0	View file
include/media/v4l2-subdev.h	modified	+3	−2	View file
include/media/videobuf2-core.h	modified	+35	−15	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 91410b6..b68698f 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2486,6 +2486,9 @@ ioctls.</para>
         <listitem>
 	  <para>Flash API. <xref linkend="flash-controls" /></para>
         </listitem>
+        <listitem>
+	  <para>&VIDIOC-CREATE-BUFS; and &VIDIOC-PREPARE-BUF; ioctls.</para>
+        </listitem>
       </itemizedlist>
     </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 23fdf79..3bc5ee8 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the
 	    <entry>Enables a power line frequency filter to avoid
 flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:
 <constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0),
-<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1) and
-<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2).</entry>
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1),
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2) and
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_AUTO</constant> (3).</entry>
 	  </row>
 	  <row>
 	    <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>

Documentation/DocBook/media/v4l/io.xml

View file

diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml
index c57d1ec..3f47df1 100644
--- a/Documentation/DocBook/media/v4l/io.xml
+++ b/Documentation/DocBook/media/v4l/io.xml
@@ -927,6 +927,33 @@ ioctl is called.</entry>
 Applications set or clear this flag before calling the
 <constant>VIDIOC_QBUF</constant> ioctl.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>V4L2_BUF_FLAG_PREPARED</constant></entry>
+	    <entry>0x0400</entry>
+	    <entry>The buffer has been prepared for I/O and can be queued by the
+application. Drivers set or clear this flag when the
+<link linkend="vidioc-querybuf">VIDIOC_QUERYBUF</link>, <link
+	  linkend="vidioc-qbuf">VIDIOC_PREPARE_BUF</link>, <link
+	  linkend="vidioc-qbuf">VIDIOC_QBUF</link> or <link
+	  linkend="vidioc-qbuf">VIDIOC_DQBUF</link> ioctl is called.</entry>
+	  </row>
+	  <row>
+	    <entry><constant>V4L2_BUF_FLAG_NO_CACHE_INVALIDATE</constant></entry>
+	    <entry>0x0400</entry>
+	    <entry>Caches do not have to be invalidated for this buffer.
+Typically applications shall use this flag if the data captured in the buffer
+is not going to be touched by the CPU, instead the buffer will, probably, be
+passed on to a DMA-capable hardware unit for further processing or output.
+</entry>
+	  </row>
+	  <row>
+	    <entry><constant>V4L2_BUF_FLAG_NO_CACHE_CLEAN</constant></entry>
+	    <entry>0x0800</entry>
+	    <entry>Caches do not have to be cleaned for this buffer.
+Typically applications shall use this flag for output buffers if the data
+in this buffer has not been created by the CPU but by some DMA-capable unit,
+in which case caches have not been used.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>

Documentation/DocBook/media/v4l/v4l2.xml

View file

diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 40132c2..2ab365c 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -469,6 +469,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-close;
     &sub-ioctl;
     <!-- All ioctls go here. -->
+    &sub-create-bufs;
     &sub-cropcap;
     &sub-dbg-g-chip-ident;
     &sub-dbg-g-register;
@@ -511,6 +512,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-queryctrl;
     &sub-query-dv-preset;
     &sub-querystd;
+    &sub-prepare-buf;
     &sub-reqbufs;
     &sub-s-hw-freq-seek;
     &sub-streamon;

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

diff --git a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
new file mode 100644
index 0000000..73ae8a6
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
@@ -0,0 +1,139 @@
+<refentry id="vidioc-create-bufs">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_CREATE_BUFS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_CREATE_BUFS</refname>
+    <refpurpose>Create buffers for Memory Mapped or User Pointer I/O</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+	<funcdef>int <function>ioctl</function></funcdef>
+	<paramdef>int <parameter>fd</parameter></paramdef>
+	<paramdef>int <parameter>request</parameter></paramdef>
+	<paramdef>struct v4l2_create_buffers *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>fd</parameter></term>
+	<listitem>
+	  <para>&fd;</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>request</parameter></term>
+	<listitem>
+	  <para>VIDIOC_CREATE_BUFS</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>argp</parameter></term>
+	<listitem>
+	  <para></para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>This ioctl is used to create buffers for <link linkend="mmap">memory
+mapped</link> or <link linkend="userp">user pointer</link>
+I/O. It can be used as an alternative or in addition to the
+<constant>VIDIOC_REQBUFS</constant> ioctl, when a tighter control over buffers
+is required. This ioctl can be called multiple times to create buffers of
+different sizes.</para>
+
+    <para>To allocate device buffers applications initialize relevant fields of
+the <structname>v4l2_create_buffers</structname> structure. They set the
+<structfield>type</structfield> field in the
+<structname>v4l2_format</structname> structure, embedded in this
+structure, to the respective stream or buffer type.
+<structfield>count</structfield> must be set to the number of required buffers.
+<structfield>memory</structfield> specifies the required I/O method. The
+<structfield>format</structfield> field shall typically be filled in using
+either the <constant>VIDIOC_TRY_FMT</constant> or
+<constant>VIDIOC_G_FMT</constant> ioctl(). Additionally, applications can adjust
+<structfield>sizeimage</structfield> fields to fit their specific needs. The
+<structfield>reserved</structfield> array must be zeroed.</para>
+
+    <para>When the ioctl is called with a pointer to this structure the driver
+will attempt to allocate up to the requested number of buffers and store the
+actual number allocated and the starting index in the
+<structfield>count</structfield> and the <structfield>index</structfield> fields
+respectively. On return <structfield>count</structfield> can be smaller than
+the number requested. The driver may also increase buffer sizes if required,
+however, it will not update <structfield>sizeimage</structfield> field values.
+The user has to use <constant>VIDIOC_QUERYBUF</constant> to retrieve that
+information.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-create-buffers">
+      <title>struct <structname>v4l2_create_buffers</structname></title>
+      <tgroup cols="3">
+	&cs-str;
+	<tbody valign="top">
+	  <row>
+	    <entry>__u32</entry>
+	    <entry><structfield>index</structfield></entry>
+	    <entry>The starting buffer index, returned by the driver.</entry>
+	  </row>
+	  <row>
+	    <entry>__u32</entry>
+	    <entry><structfield>count</structfield></entry>
+	    <entry>The number of buffers requested or granted.</entry>
+	  </row>
+	  <row>
+	    <entry>&v4l2-memory;</entry>
+	    <entry><structfield>memory</structfield></entry>
+	    <entry>Applications set this field to
+<constant>V4L2_MEMORY_MMAP</constant> or
+<constant>V4L2_MEMORY_USERPTR</constant>.</entry>
+	  </row>
+	  <row>
+	    <entry>&v4l2-format;</entry>
+	    <entry><structfield>format</structfield></entry>
+	    <entry>Filled in by the application, preserved by the driver.</entry>
+	  </row>
+	  <row>
+	    <entry>__u32</entry>
+	    <entry><structfield>reserved</structfield>[8]</entry>
+	    <entry>A place holder for future extensions.</entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+	<term><errorcode>ENOMEM</errorcode></term>
+	<listitem>
+	  <para>No memory to allocate buffers for <link linkend="mmap">memory
+mapped</link> I/O.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EINVAL</errorcode></term>
+	<listitem>
+	  <para>The buffer type (<structfield>type</structfield> field) or the
+requested I/O method (<structfield>memory</structfield>) is not
+supported.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>

Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml

View file

diff --git a/Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml b/Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml
new file mode 100644
index 0000000..7bde698
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml
@@ -0,0 +1,88 @@
+<refentry id="vidioc-prepare-buf">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_PREPARE_BUF</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_PREPARE_BUF</refname>
+    <refpurpose>Prepare a buffer for I/O</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+	<funcdef>int <function>ioctl</function></funcdef>
+	<paramdef>int <parameter>fd</parameter></paramdef>
+	<paramdef>int <parameter>request</parameter></paramdef>
+	<paramdef>struct v4l2_buffer *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+	<term><parameter>fd</parameter></term>
+	<listitem>
+	  <para>&fd;</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>request</parameter></term>
+	<listitem>
+	  <para>VIDIOC_PREPARE_BUF</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><parameter>argp</parameter></term>
+	<listitem>
+	  <para></para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Applications can optionally call the
+<constant>VIDIOC_PREPARE_BUF</constant> ioctl to pass ownership of the buffer
+to the driver before actually enqueuing it, using the
+<constant>VIDIOC_QBUF</constant> ioctl, and to prepare it for future I/O.
+Such preparations may include cache invalidation or cleaning. Performing them
+in advance saves time during the actual I/O. In case such cache operations are
+not required, the application can use one of
+<constant>V4L2_BUF_FLAG_NO_CACHE_INVALIDATE</constant> and
+<constant>V4L2_BUF_FLAG_NO_CACHE_CLEAN</constant> flags to skip the respective
+step.</para>
+
+    <para>The <structname>v4l2_buffer</structname> structure is
+specified in <xref linkend="buffer" />.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+	<term><errorcode>EBUSY</errorcode></term>
+	<listitem>
+	  <para>File I/O is in progress.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><errorcode>EINVAL</errorcode></term>
+	<listitem>
+	  <para>The buffer <structfield>type</structfield> is not
+supported, or the <structfield>index</structfield> is out of bounds,
+or no buffers have been allocated yet, or the
+<structfield>userptr</structfield> or
+<structfield>length</structfield> are invalid.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>

arch/arm/mach-pxa/pcm990-baseboard.c

View file

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 9a9c539..6d38c65 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -394,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link,
 	}
 
 	if (flags & SOCAM_DATAWIDTH_8)
-		gpio_set_value(gpio_bus_switch, 1);
+		gpio_set_value_cansleep(gpio_bus_switch, 1);
 	else
-		gpio_set_value(gpio_bus_switch, 0);
+		gpio_set_value_cansleep(gpio_bus_switch, 0);
 
 	return 0;
 }

arch/arm/mach-shmobile/board-ap4evb.c

View file

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 5b7edad..f9f66c2 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -933,7 +933,7 @@ static struct platform_device ap4evb_camera = {
 static struct sh_csi2_client_config csi2_clients[] = {
 	{
 		.phy		= SH_CSI2_PHY_MAIN,
-		.lanes		= 3,
+		.lanes		= 0,		/* default: 2 lanes */
 		.channel	= 0,
 		.pdev		= &ap4evb_camera,
 	},

arch/arm/mach-shmobile/board-mackerel.c

View file

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 3689ad2..6820423 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1223,9 +1223,10 @@ static struct soc_camera_platform_info camera_info = {
 		.width = 640,
 		.height = 480,
 	},
-	.bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
-	SOCAM_DATA_ACTIVE_HIGH,
+	.mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+	V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+	V4L2_MBUS_DATA_ACTIVE_HIGH,
+	.mbus_type = V4L2_MBUS_PARALLEL,
 	.set_capture = camera_set_capture,
 };
 

arch/sh/boards/mach-ap325rxa/setup.c

View file

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index d362657..7030f4c 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -345,9 +345,10 @@ static struct soc_camera_platform_info camera_info = {
 		.width = 640,
 		.height = 480,
 	},
-	.bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
-	SOCAM_DATA_ACTIVE_HIGH,
+	.mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+	V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+	V4L2_MBUS_DATA_ACTIVE_HIGH,
+	.mbus_type = V4L2_MBUS_PARALLEL,
 	.set_capture = camera_set_capture,
 };
 
@@ -501,8 +502,7 @@ static struct i2c_board_info ap325rxa_i2c_camera[] = {
 };
 
 static struct ov772x_camera_info ov7725_info = {
-	.flags		= OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP | \
-			  OV772X_FLAG_8BIT,
+	.flags		= OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
 	.edgectrl	= OV772X_AUTO_EDGECTRL(0xf, 0),
 };
 

arch/sh/boards/mach-migor/setup.c

View file

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 2d4c9c8..e4c8119 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -448,9 +448,7 @@ static struct i2c_board_info migor_i2c_camera[] = {
 	},
 };
 
-static struct ov772x_camera_info ov7725_info = {
-	.flags		= OV772X_FLAG_8BIT,
-};
+static struct ov772x_camera_info ov7725_info;
 
 static struct soc_camera_link ov7725_link = {
 	.power		= ov7725_power,

drivers/dma/ipu/ipu_idmac.c

View file

diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index 6815905..ddc2a13 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1307,6 +1307,7 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)
 	    ipu_submit_buffer(ichan, descnew, sgnew, ichan->active_buffer) < 0) {
 		callback = descnew->txd.callback;
 		callback_param = descnew->txd.callback_param;
+		list_del_init(&descnew->list);
 		spin_unlock(&ichan->lock);
 		if (callback)
 			callback(callback_param);
@@ -1428,39 +1429,58 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 {
 	struct idmac_channel *ichan = to_idmac_chan(chan);
 	struct idmac *idmac = to_idmac(chan->device);
+	struct ipu *ipu = to_ipu(idmac);
+	struct list_head *list, *tmp;
 	unsigned long flags;
 	int i;
 
-	/* Only supports DMA_TERMINATE_ALL */
-	if (cmd != DMA_TERMINATE_ALL)
-		return -ENXIO;
+	switch (cmd) {
+	case DMA_PAUSE:
+		spin_lock_irqsave(&ipu->lock, flags);
+		ipu_ic_disable_task(ipu, chan->chan_id);
 
-	ipu_disable_channel(idmac, ichan,
-			    ichan->status >= IPU_CHANNEL_ENABLED);
+		/* Return all descriptors into "prepared" state */
+		list_for_each_safe(list, tmp, &ichan->queue)
+			list_del_init(list);
 
-	tasklet_disable(&to_ipu(idmac)->tasklet);
+		ichan->sg[0] = NULL;
+		ichan->sg[1] = NULL;
 
-	/* ichan->queue is modified in ISR, have to spinlock */
-	spin_lock_irqsave(&ichan->lock, flags);
-	list_splice_init(&ichan->queue, &ichan->free_list);
+		spin_unlock_irqrestore(&ipu->lock, flags);
 
-	if (ichan->desc)
-		for (i = 0; i < ichan->n_tx_desc; i++) {
-			struct idmac_tx_desc *desc = ichan->desc + i;
-			if (list_empty(&desc->list))
-				/* Descriptor was prepared, but not submitted */
-				list_add(&desc->list, &ichan->free_list);
+		ichan->status = IPU_CHANNEL_INITIALIZED;
+		break;
+	case DMA_TERMINATE_ALL:
+		ipu_disable_channel(idmac, ichan,
+				    ichan->status >= IPU_CHANNEL_ENABLED);
 
-			async_tx_clear_ack(&desc->txd);
-		}
+		tasklet_disable(&ipu->tasklet);
 
-	ichan->sg[0] = NULL;
-	ichan->sg[1] = NULL;
-	spin_unlock_irqrestore(&ichan->lock, flags);
+		/* ichan->queue is modified in ISR, have to spinlock */
+		spin_lock_irqsave(&ichan->lock, flags);
+		list_splice_init(&ichan->queue, &ichan->free_list);
 
-	tasklet_enable(&to_ipu(idmac)->tasklet);
+		if (ichan->desc)
+			for (i = 0; i < ichan->n_tx_desc; i++) {
+				struct idmac_tx_desc *desc = ichan->desc + i;
+				if (list_empty(&desc->list))
+					/* Descriptor was prepared, but not submitted */
+					list_add(&desc->list, &ichan->free_list);
 
-	ichan->status = IPU_CHANNEL_INITIALIZED;
+				async_tx_clear_ack(&desc->txd);
+			}
+
+		ichan->sg[0] = NULL;
+		ichan->sg[1] = NULL;
+		spin_unlock_irqrestore(&ichan->lock, flags);
+
+		tasklet_enable(&ipu->tasklet);
+
+		ichan->status = IPU_CHANNEL_INITIALIZED;
+		break;
+	default:
+		return -ENOSYS;
+	}
 
 	return 0;
 }
@@ -1663,7 +1683,6 @@ static void __exit ipu_idmac_exit(struct ipu *ipu)
 		struct idmac_channel *ichan = ipu->channel + i;
 
 		idmac_control(&ichan->dma_chan, DMA_TERMINATE_ALL, 0);
-		idmac_prep_slave_sg(&ichan->dma_chan, NULL, 0, DMA_NONE, 0);
 	}
 
 	dma_async_device_unregister(&idmac->dma);

drivers/media/dvb/ddbridge/Makefile

View file

diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile
index cf7214e..38019ba 100644
--- a/drivers/media/dvb/ddbridge/Makefile
+++ b/drivers/media/dvb/ddbridge/Makefile
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/
 ccflags-y += -Idrivers/media/common/tuners/
 
 # For the staging CI driver cxd2099
-ccflags-y += -Idrivers/staging/cxd2099/
+ccflags-y += -Idrivers/staging/media/cxd2099/

drivers/media/dvb/dvb-usb/Makefile

View file

diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 7d0710b..26c8b9e 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -102,6 +102,7 @@ obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o
 
 dvb-usb-mxl111sf-objs = mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o mxl111sf-gpio.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
+obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
 
 ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

drivers/media/dvb/dvb-usb/dvb-usb-ids.h

View file

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2ad33ba..2d08c9b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -37,6 +37,7 @@
 #define USB_VID_HAUPPAUGE			0x2040
 #define USB_VID_HYPER_PALTEK			0x1025
 #define USB_VID_INTEL				0x8086
+#define USB_VID_ITETECH				0x048d
 #define USB_VID_KWORLD				0xeb2a
 #define USB_VID_KWORLD_2			0x1b80
 #define USB_VID_KYE				0x0458
@@ -126,6 +127,7 @@
 #define USB_PID_GRANDTEC_DVBT_USB_COLD			0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM			0x0fa1
 #define USB_PID_INTEL_CE9500				0x9500
+#define USB_PID_ITETECH_IT9135				0x9135
 #define USB_PID_KWORLD_399U				0xe399
 #define USB_PID_KWORLD_399U_2				0xe400
 #define USB_PID_KWORLD_395U				0xe396

drivers/media/dvb/dvb-usb/it913x.c

View file

diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index f027a2c..c462261 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -60,6 +60,17 @@ struct it913x_state {
 	u8 id;
 };
 
+struct ite_config {
+	u8 chip_ver;
+	u16 chip_type;
+	u32 firmware;
+	u8 tuner_id_0;
+	u8 tuner_id_1;
+	u8 dual_mode;
+};
+
+struct ite_config it913x_config;
+
 static int it913x_bulk_write(struct usb_device *dev,
 				u8 *snd, int len, u8 pipe)
 {
@@ -191,18 +202,23 @@ static int it913x_read_reg(struct usb_device *udev, u32 reg)
 static u32 it913x_query(struct usb_device *udev, u8 pro)
 {
 	int ret;
-	u32 res = 0;
 	u8 data[4];
 	ret = it913x_io(udev, READ_LONG, pro, CMD_DEMOD_READ,
-		0x1222, 0, &data[0], 1);
-	if (data[0] == 0x1) {
-		ret = it913x_io(udev, READ_SHORT, pro,
+		0x1222, 0, &data[0], 3);
+
+	it913x_config.chip_ver = data[0];
+	it913x_config.chip_type = (u16)(data[2] << 8) + data[1];
+
+	info("Chip Version=%02x Chip Type=%04x", it913x_config.chip_ver,
+		it913x_config.chip_type);
+