Showing posts with label Linux Media. Show all posts
Showing posts with label Linux Media. Show all posts

2015-02-10

[GIT PULL for v3.20-rc1] media updates

Subject: [GIT PULL for v3.20-rc1] media updates
Date: Mon, 9 Feb 2015 13:57:17 -0200
From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Organization: Samsung
To: Linus Torvalds <torvalds@linux-foundation.org>
CC: Andrew Morton <akpm@linux-foundation.org>, Linux Media Mailing List <linux-media@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>

Hi Linus,

Please pull from:
  git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v3.20-1


For:

  - Some documentation updates and a few new pixel formats;
  - Stop btcx-risc abuse by cx88 and move it to bt8xx driver;
  - New platform driver: am437x;
  - New webcam driver: toptek;
  - New remote controller hardware protocols added to img-ir driver;
  - Removal of a few very old drivers that relies on old kABIs and are for
    very hard to find hardware: parallel port webcam drivers (bw-qcam, c-cam,
    pms and w9966), tlg2300, Video In/Out for SGI (vino);
  - Removal of the USB Telegent driver (tlg2300). The company that developed
    this driver has long gone and the hardware is hard to find. As it relies
    on a legacy set of kABI symbols and nobody seems to care about it, remove
    it.
  - several improvements at rtl2832 driver;
  - conversion on cx28521 and au0828 to use videobuf2 (VB2);
  - several improvements, fixups and board additions.

Regards,
Mauro

-

The following changes since commit 26bc420b59a38e4e6685a73345a0def461136dce:

  Linux 3.19-rc6 (2015-01-25 20:04:41 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v3.20-1

for you to fetch changes up to 4bad5d2d25099a42e146d7b18d2b98950ed287f5:

  [media] dvb_net: Convert local hex dump to print_hex_dump_debug (2015-02-03 18:24:44 -0200)

----------------------------------------------------------------
media updates for v3.20-rc1

----------------------------------------------------------------
Akihiro Tsukada (1):
      [media] dvb: tc90522: re-add symbol-rate report

Alexey Khoroshilov (1):
      [media] cx231xx: fix usbdev leak on failure paths in cx231xx_usb_probe()

Andrey Utkin (1):
      [media] solo6x10: just pass frame motion flag from hardware, drop additional handling as complicated and unstable

Andy Shevchenko (1):
      [media] lirc_dev: avoid potential null-dereference

Antonio Ospite (1):
      [media] gspca_stv06xx: enable button found on some Quickcam Express variant

Antti Palosaari (95):
      [media] cx23885: do not unregister demod I2C client twice on error
      [media] cx23885: correct some I2C client indentations
      [media] cx23885: fix I2C scan printout
      [media] cx23885: Hauppauge WinTV-HVR5525
      [media] rtl2832: convert driver to I2C binding
      [media] rtl28xxu: switch rtl2832 demod attach to I2C binding
      [media] rtl28xxu: change module unregister order
      [media] si2168: define symbol rate limits
      [media] si2168: rename device state variable from 's' to 'dev'
      [media] si2168: carry pointer to client instead of state
      [media] si2168: get rid of own struct i2c_client pointer
      [media] si2168: simplify si2168_cmd_execute() error path
      [media] si2168: rename few things
      [media] si2168: change firmware version print from debug to info
      [media] si2168: change stream id debug log formatter
      [media] si2168: add own goto label for kzalloc failure
      [media] si2168: enhance firmware download routine
      [media] si2168: remove unneeded fw variable initialization
      [media] si2168: print chip version
      [media] si2168: change firmware variable name and type
      [media] si2157: rename device state variable from 's' to 'dev'
      [media] si2157: simplify si2157_cmd_execute() error path
      [media] si2157: carry pointer to client instead of state in tuner_priv
      [media] si2157: change firmware download error handling
      [media] si2157: trivial ID table changes
      [media] si2157: add own goto label for kfree() on probe error
      [media] si2157: print firmware version
      [media] si2157: print chip version
      [media] si2157: change firmware variable name and type
      [media] dvb-usb-v2: add pointer to 'struct usb_interface' for driver usage
      [media] rtl2830: convert driver to kernel I2C model
      [media] rtl28xxu: use I2C binding for RTL2830 demod driver
      [media] rtl2830: get rid of legacy DVB driver binding
      [media] rtl2830: rename 'priv' to 'dev'
      [media] rtl2830: carry pointer to I2C client for every function
      [media] rtl2830: fix logging
      [media] rtl2830: get rid of internal config data
      [media] rtl2830: style related changes
      [media] rtl2830: implement DVBv5 CNR statistic
      [media] rtl2830: implement DVBv5 signal strength statistics
      [media] rtl2830: implement DVBv5 BER statistic
      [media] rtl2830: wrap DVBv5 signal strength to DVBv3
      [media] rtl2830: wrap DVBv5 BER to DVBv3
      [media] rtl2830: wrap DVBv5 CNR to DVBv3 SNR
      [media] rtl2830: implement PID filter
      [media] rtl28xxu: add support for RTL2831U/RTL2830 PID filter
      [media] rtl2830: implement own I2C locking
      [media] rtl2830: convert to regmap API
      [media] rtl2832: add platform data callbacks for exported resources
      [media] rtl28xxu: use rtl2832 demod callbacks accessing its resources
      [media] rtl2832: remove exported resources
      [media] rtl2832: rename driver state variable from 'priv' to 'dev'
      [media] rtl2832: enhance / fix logging
      [media] rtl2832: move all configuration to platform data struct
      [media] rtl28xxu: use platform data config for rtl2832 demod
      [media] rtl2832: convert to regmap API
      [media] rtl2832: implement DVBv5 CNR statistic
      [media] rtl2832: implement DVBv5 BER statistic
      [media] rtl2832: wrap DVBv5 CNR to DVBv3 SNR
      [media] rtl2832: wrap DVBv5 BER to DVBv3
      [media] rtl2832: implement DVBv5 signal strength statistics
      [media] rtl28xxu: use demod mux I2C adapter for every tuner
      [media] rtl2832: drop FE i2c gate control support
      [media] rtl2832: define more demod lock statuses
      [media] rtl2832: implement PID filter
      [media] rtl28xxu: add support for RTL2832U/RTL2832 PID filter
      [media] rtl2832: use regmap reg cache
      [media] rtl2832: remove unneeded software reset from init()
      [media] rtl2832: merge reg page as a part of reg address
      [media] rtl2832: provide register IO callbacks
      [media] rtl2832_sdr: rename state variable from 's' to 'dev'
      [media] rtl2832_sdr: convert to platform driver
      [media] rtl28xxu: switch SDR module to platform driver
      [media] rtl28xxu: use master I2C adapter for slave demods
      [media] rtl2832_sdr: fix logging
      [media] rtl2832_sdr: cleanups
      [media] rtl2832: cleanups and minor changes
      [media] rtl2832: claim copyright and module author
      [media] rtl2832: implement sleep
      [media] rtl28xxu: fix DVB FE callback
      [media] rtl28xxu: simplify FE callback handling
      [media] rtl28xxu: do not refcount rtl2832_sdr module
      [media] rtl2832_sdr: refcount to rtl28xxu
      [media] rtl2832: remove internal mux I2C adapter
      [media] rtl28xxu: rename state variable 'priv' to 'dev'
      [media] rtl28xxu: fix logging
      [media] rtl28xxu: move usb buffers to state
      [media] rtl28xxu: add heuristic to detect chip type
      [media] rtl28xxu: merge chip type specific all callbacks
      [media] rtl28xxu: merge rtl2831u and rtl2832u properties
      [media] rtl28xxu: correct reg access routine name prefixes
      [media] rtl2832: implement own lock for regmap
      [media] rtl2830: add kernel-doc comments for platform_data
      [media] rtl2832: add kernel-doc comments for platform_data
      [media] rtl2832_sdr: add kernel-doc comments for platform_data

Arnd Bergmann (5):
      [media] timberdale: do not select TIMB_DMA
      [media] radio/aimslab: use mdelay instead of udelay
      [media] siano: fix Kconfig dependencies
      [media] davinci: add V4L2 dependencies
      [media] marvell-ccic: MMP_CAMERA no longer builds

Asaf Vertz (1):
      [media] media: stb0899_drv: use time_after()

Aviv Greenberg (2):
      [media] v4l: Add packed Bayer raw10 pixel formats
      [media] uvcvideo: Remove extra commit on resume()

Benjamin Larsson (4):
      [media] mn88472: calculate the IF register values
      [media] mn88472: document demod reset
      [media] mn88472: add 5MHz dvb-t2 bandwitdh support
      [media] mn88472: simplify bandwidth registers setting code

Benoit Parrot (1):
      [media] media: platform: add VPFE capture driver support for AM437X

Dan Carpenter (1):
      [media] coda: improve safety in coda_register_device()

Fabian Frederick (5):
      [media] tw68: remove unnecessary version.h inclusion
      [media] vivid: remove unnecessary version.h inclusion
      [media] uvcvideo: remove unnecessary version.h inclusion
      [media] s5p-g2d: remove unnecessary version.h inclusion
      [media] s5p-mfc: remove unnecessary version.h inclusion

Fabio Estevam (2):
      [media] coda: coda-common: Remove mx53 entry from coda_platform_ids
      [media] adv7180: Remove the unneeded 'err' label

Fengguang Wu (1):
      [media] media: platform: fix platform_no_drv_owner.cocci warnings

Geert Uytterhoeven (2):
      [media] VIDEO_CAFE_CCIC should select VIDEOBUF2_DMA_SG
      [media] vb2-vmalloc: Protect DMA-specific code by #ifdef CONFIG_HAS_DMA

Guennadi Liakhovetski (1):
      [media] soc-camera: remove redundant code

Hans Verkuil (34):
      [media] media: remove emacs editor variables
      [media] v4l2 subdevs: replace get/set_crop by get/set_selection
      [media] v4l2-subdev: drop get/set_crop pad ops
      [media] v4l2-subdev: drop unused op enum_mbus_fmt
      [media] media/i2c/Kconfig: drop superfluous MEDIA_CONTROLLER
      [media] cx25821: remove bogus btcx_risc dependency
      [media] cx231xx: remove btcx_riscmem reference
      [media] btcx-risc: move to bt8xx
      [media] cx28521: drop videobuf abuse in cx25821-alsa
      [media] cx25821: convert to vb2
      [media] cx25821: add create_bufs support
      [media] cx25821: remove video output support
      [media] media: drivers shouldn't touch debug field in video_device
      [media] v4l2 core: improve debug flag handling
      [media] v4l2-framework.txt: document debug attribute
      [media] av7110: fix sparse warning
      [media] budget-core: fix sparse warnings
      [media] ivtv: fix sparse warning
      [media] videobuf2-vmalloc: fix sparse warning
      [media] hd29l2: fix sparse error and warnings
      [media] m5mols: fix sparse warnings
      [media] s5k4ecgx: fix sparse warnings
      [media] s5k6aa: fix sparse warnings
      [media] s5k5baf: fix sparse warnings
      [media] videobuf: make unused exported functions static
      [media] hdmi: add new HDMI 2.0 defines
      [media] hdmi: rename HDMI_AUDIO_CODING_TYPE_EXT_STREAM to _EXT_CT
      [media] vivid: Y offset should depend on quant. range
      [media] pwc: fix WARN_ON
      [media] tlg2300: remove deprecated staging driver
      [media] vino/saa7191: remove deprecated drivers
      [media] bw/c-qcam, w9966, pms: remove deprecated staging drivers
      [media] Documentation/video4linux: remove obsolete text files
      [media] vivid: use consistent colorspace/Y'CbCr Encoding strings

Hans de Goede (3):
      [media] rc: sunxi-cir: Add support for an optional reset controller
      [media] rc: sunxi-cir: Add support for the larger fifo found on sun5i and sun6i
      [media] gspca: Fix underflow in vidioc_s_parm()

Heba Aamer (1):
      [media] staging: lirc_serial: adjust boolean assignments

Ian Molton (1):
      [media] rcar_vin: helper function for streaming stop

Ismael Luceno (5):
      [media] solo6x10: s/unsigned char/u8/
      [media] solo6x10: Fix eeprom_* functions buffer's type
      [media] solo6x10: Fix solo_eeprom_read retval type
      [media] solo6x10: s/uint8_t/u8/
      [media] MAINTAINERS: Update solo6x10 entry

James Hogan (1):
      [media] rc-main: Re-apply filter for no-op protocol change

Joe Howse (1):
      [media] gspca: Add high-speed modes for PS3 Eye camera

Joe Perches (3):
      [media] dvb_net: Use vsprintf %pM extension to print Ethernet addresses
      [media] dvb_net: Use standard debugging facilities
      [media] dvb_net: Convert local hex dump to print_hex_dump_debug

John McMaster (1):
      [media] gspca_touptek: Add support for ToupTek UCMOS series USB cameras

Josh Wu (1):
      [media] ov2640: use the v4l2 size definitions

Julia Lawall (4):
      [media] au0828: Use setup_timer
      [media] s2255drv: Use setup_timer
      [media] usbvision: Use setup_timer
      [media] pvrusb2: Use setup_timer

Jurgen Kramer (1):
      [media] Si2168: increase timeout to fix firmware loading

Lad, Prabhakar (2):
      [media] media: usb: uvc: use vb2_ops_wait_prepare/finish helper
      [media] soc_camera: use vb2_ops_wait_prepare/finish helper

Lars-Peter Clausen (14):
      [media] adv7180: Do not request the IRQ again during resume
      [media] adv7180: Pass correct flags to request_threaded_irq()
      [media] adv7180: Cleanup register define naming
      [media] adv7180: Do implicit register paging
      [media] adv7180: Reset the device before initialization
      [media] adv7180: Add media controller support
      [media] adv7180: Consolidate video mode setting
      [media] adv7180: Prepare for multi-chip support
      [media] adv7180: Add support for the adv7182
      [media] adv7180: Add support for the adv7280/adv7281/adv7282
      [media] adv7180: Add support for the adv7280-m/adv7281-m/adv7281-ma/adv7282-m
      [media] adv7180: Add I2P support
      [media] adv7180: Add fast switch support
      [media] Add MAINTAINERS entry for the adv7180

Laurent Pinchart (7):
      [media] omap3isp: Fix division by 0
      [media] v4l: omap4iss: Enable DMABUF support
      [media] v4l: omap4iss: Remove bogus frame number propagation
      [media] v4l: omap4iss: csi2: Perform real frame number propagation
      [media] v4l: omap4iss: Stop started entities when pipeline start fails
      [media] v4l: vsp1: Remove support for platform data
      [media] Revert "[media] v4l: omap4iss: Add module debug parameter"

Luca Bonissi (1):
      [media] gspca_vc032x: Fix wrong bytesperline

Lucas Stach (1):
      [media] coda: adjust sequence offset after unexpected decoded frame

Luis de Bethencourt (3):
      [media] staging: media: lirc: lirc_zilog.c: fix quoted strings split across lines
      [media] staging: media: lirc: lirc_zilog.c: keep consistency in dev functions
      [media] staging: media: lirc: lirc_zilog.c: missing newline in dev_err()

Malcolm Priestley (5):
      [media] lmedm04: Increase Interupt due time to 200 msec
      [media] lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb
      [media] lmedm04: create frontend callbacks for signal/snr/ber/ucblocks
      [media] lmedm04: Create frontend call back for read status
      [media] lmedm04: add read snr, signal strength and ber call backs

Markus Elfring (1):
      [media] staging: bcm2048: Delete an unnecessary check before the function call "video_unregister_device"

Markus Pargmann (1):
      [media] coda: fix width validity check when starting to decode

Martin Bugge (2):
      [media] hdmi: added unpack and logging functions for InfoFrames
      [media] adv7842: simplify InfoFrame logging

Martin Kepplinger (1):
      [media] stb0899: use sign_extend32() for sign extension

Mauro Carvalho Chehab (10):
      [media] mb86a20s: remove unused debug modprobe parameter
      Merge tag 'v3.19-rc6' into patchwork
      [media] gspca/touptek: Fix a few CodingStyle issues
      [media] cx231xx: don't use dev it not allocated
      [media] cx23885: move CI/MAC registration to a separate function
      [media] dib8000: upd_demod_gain_period should be u32
      [media] rtl2830: declare functions as static
      [media] rtl2832: declare functions as static
      [media] rtl28xxu: properly initialize pdata
      [media] cx88-dvb: whitespace cleanup

Michael Ira Krufky (2):
      [media] lgdt3305: we only need to pass state into lgdt3305_mpeg_mode_polarity()
      [media] lgdt3305: add support for fixed tp clock mode

Nibble Max (1):
      [media] smipcie: return more proper value in interrupt handler

Nicholas Mc Guire (1):
      [media] pvrusb2: use msecs_to_jiffies for conversion

Nicolas Dufresne (3):
      [media] s5p-mfc-v6+: Use display_delay_enable CID
      [media] s5p-mfc-dec: Don't use encoder stop command
      [media] media-doc: Fix MFC display delay control doc

Nobuhiro Iwamatsu (2):
      [media] v4l: vsp1: Fix VI6_DISP_IRQ_ENB_LNEE macro
      [media] v4l: vsp1: Fix VI6_DISP_IRQ_STA_LNE macro

Olli Salonen (2):
      [media] si2168: return error if set_frontend is called with invalid parameters
      [media] si2168: add support for 1.7MHz bandwidth

Ondrej Zary (3):
      [media] bttv: Convert to generic TEA575x interface
      [media] tea575x: split and export functions
      [media] bttv: Improve TEA575x support

Philipp Zabel (18):
      [media] coda: fix encoder rate control parameter masks
      [media] coda: remove context debugfs entry last
      [media] coda: move meta out of padding
      [media] coda: fix job_ready debug reporting for bitstream decoding
      [media] coda: fix try_fmt_vid_out colorspace setting
      [media] coda: properly clear f_cap in coda_s_fmt_vid_out
      [media] coda: initialize SRAM on probe
      [media] coda: clear RET_DEC_PIC_SUCCESS flag in prepare_decode
      [media] coda: remove unused isequence, reset qsequence in stop_streaming
      [media] coda: issue seq_end_work during stop_streaming
      [media] coda: don't ever use subsampling ping-pong buffers as reconstructed reference buffers
      [media] coda: add coda_estimate_sizeimage and use it in set_defaults
      [media] coda: switch BIT decoder source queue to vmalloc
      [media] coda: make seq_end_work optional
      [media] coda: free context buffers under buffer mutex
      [media] coda: add support for contexts that do not use the BIT processor
      [media] coda: allocate bitstream ringbuffer only for BIT decoder
      [media] coda: simplify check in coda_buf_queue

Prabhakar Lad (9):
      [media] media: s3c-camif: use vb2_ops_wait_prepare/finish helper
      [media] media: ti-vpe: use vb2_ops_wait_prepare/finish helper
      [media] media: exynos-gsc: use vb2_ops_wait_prepare/finish helper
      [media] media: sh_veu: use vb2_ops_wait_prepare/finish helper
      [media] media: s5p-tv: use vb2_ops_wait_prepare/finish helper
      [media] media: s5p-mfc: use vb2_ops_wait_prepare/finish helper
      [media] media: Kconfig: drop duplicate dependency of HAS_DMA
      [media] media: am437x: fix sparse warnings
      [media] media: ti-vpe: Use mem-to-mem ioctl helpers

Rickard Strandqvist (7):
      [media] media: radio: wl128x: fmdrv_rx.c: Remove unused function
      [media] media: i2c: adv7604.c: Remove some unused functions
      [media] media: pci: mantis: mantis_core.c: Remove unused function
      [media] media: pci: saa7134: saa7134-video.c: Remove unused function
      [media] media: platform: vsp1: vsp1_hsit: Remove unused function
      [media] media: i2c: adv7604: Remove some unused functions
      [media] usb: pvrusb2: pvrusb2-hdw: Remove unused function

Russell King (8):
      [media] em28xx: fix em28xx-input removal
      [media] em28xx: ensure "closing" messages terminate with a newline
      [media] em28xx-input: fix missing newlines
      [media] em28xx-core: fix missing newlines
      [media] em28xx-audio: fix missing newlines
      [media] em28xx-audio: fix missing newlines
      [media] em28xx-dvb: fix missing newlines
      [media] em28xx-video: fix missing newlines

Sakari Ailus (22):
      [media] DocBook: v4l: Fix raw bayer pixel format documentation wording
      [media] DocBook: v4l: Rearrange raw bayer format definitions, remove bad comment
      [media] smiapp: Remove FSF's address from the license header
      [media] smiapp: List include/uapi/linux/smiapp.h in MAINTAINERS
      [media] smiapp-pll: include linux/device.h in smiapp-pll.c, not in smiapp-pll.h
      [media] smiapp: Use types better suitable for DT
      [media] smiapp: Don't give the source sub-device a temporary name
      [media] smiapp: Register async subdev
      [media] smiapp: The sensor only needs a single clock, name may be NULL
      [media] of: v4l: Document link-frequencies property in video-interfaces.txt
      [media] of: smiapp: Add documentation
      [media] smiapp: Obtain device information from the Device Tree if OF node exists
      [media] smiapp: Split sub-device initialisation off from the registered callback
      [media] smiapp: Fully probe the device in probe
      [media] smiapp: Access flash capabilities through limits
      [media] smiapp: Free control handlers in sub-device cleanup
      [media] smiapp: Clean up smiapp_init_controls()
      [media] smiapp: Separate late controls from the rest
      [media] smiapp: Move enumerating available media bus codes later
      [media] smiapp: Replace pll_flags quirk with more generic init quirk
      [media] smiapp: Add parentheses to macro arguments used in macros
      [media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't defined

Shuah Khan (4):
      [media] media: au0828 VBI support comment cleanup
      [media] media: fix au0828_analog_register() to not free au0828_dev
      [media] media: fix au0828 compile error from au0828_boards initialization
      [media] media: au0828 - convert to use videobuf2

Sifan Naeem (5):
      [media] rc: img-ir: add scancode requests to a struct
      [media] rc: img-ir: pass toggle bit to the rc driver
      [media] rc: img-ir: biphase enabled with workaround
      [media] rc: img-ir: add philips rc5 decoder module
      [media] rc: img-ir: add philips rc6 decoder module

Takanari Hayama (3):
      [media] v4l: vsp1: Reset VSP1 RPF source address
      [media] v4l: vsp1: Always enable virtual RPF when BRU is in use
      [media] v4l: vsp1: bru: Fix minimum input pixel size

William Manley (1):
      [media] uvcvideo: Add GUID for BGR 8:8:8

William Towle (1):
      [media] rcar_vin: move buffer management to .stop_streaming handler

Wolfram Sang (1):
      [media] staging: media: bcm2048: Remove obsolete cleanup for clientdata

 Documentation/DocBook/media/v4l/controls.xml       |   11 +-
 Documentation/DocBook/media/v4l/pixfmt-srggb10.xml |    2 +-
 .../DocBook/media/v4l/pixfmt-srggb10alaw8.xml      |    2 +-
 .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml      |    2 +-
 .../DocBook/media/v4l/pixfmt-srggb10p.xml          |   99 +
 Documentation/DocBook/media/v4l/pixfmt-srggb12.xml |    2 +-
 Documentation/DocBook/media/v4l/pixfmt.xml         |    1 +
 .../DocBook/media/v4l/vidioc-dv-timings-cap.xml    |    8 -
 .../DocBook/media/v4l/vidioc-enum-dv-timings.xml   |    8 -
 .../devicetree/bindings/media/i2c/nokia,smia.txt   |   63 +
 .../devicetree/bindings/media/sunxi-ir.txt         |    4 +-
 .../devicetree/bindings/media/ti-am437x-vpfe.txt   |   61 +
 .../devicetree/bindings/media/video-interfaces.txt |    3 +
 Documentation/video4linux/CQcam.txt                |  205 -
 Documentation/video4linux/README.tlg2300           |   47 -
 Documentation/video4linux/v4l2-framework.txt       |   25 +-
 Documentation/video4linux/w9966.txt                |   33 -
 MAINTAINERS                                        |   41 +-
 drivers/media/common/Kconfig                       |    4 -
 drivers/media/common/Makefile                      |    1 -
 drivers/media/common/btcx-risc.h                   |    6 -
 drivers/media/dvb-core/dvb_net.c                   |   88 +-
 drivers/media/dvb-frontends/Kconfig                |    4 +-
 drivers/media/dvb-frontends/au8522.h               |    5 -
 drivers/media/dvb-frontends/dib8000.c              |    3 +-
 drivers/media/dvb-frontends/hd29l2.c               |   10 +-
 drivers/media/dvb-frontends/lg2160.c               |    6 -
 drivers/media/dvb-frontends/lgdt3305.c             |   23 +-
 drivers/media/dvb-frontends/lgdt3305.h             |    6 +
 drivers/media/dvb-frontends/lgdt330x.c             |    6 -
 drivers/media/dvb-frontends/lgdt330x.h             |    6 -
 drivers/media/dvb-frontends/lgdt330x_priv.h        |    6 -
 drivers/media/dvb-frontends/mb86a20s.c             |    4 -
 drivers/media/dvb-frontends/mn88472.h              |    6 +
 drivers/media/dvb-frontends/nxt200x.h              |    6 -
 drivers/media/dvb-frontends/or51132.c              |    6 -
 drivers/media/dvb-frontends/or51132.h              |    6 -
 drivers/media/dvb-frontends/rtl2830.c              |  944 +++--
 drivers/media/dvb-frontends/rtl2830.h              |   79 +-
 drivers/media/dvb-frontends/rtl2830_priv.h         |   24 +-
 drivers/media/dvb-frontends/rtl2832.c              | 1336 +++---
 drivers/media/dvb-frontends/rtl2832.h              |   99 +-
 drivers/media/dvb-frontends/rtl2832_priv.h         |   32 +-
 drivers/media/dvb-frontends/rtl2832_sdr.c          | 1189 +++---
 drivers/media/dvb-frontends/rtl2832_sdr.h          |   57 +-
 drivers/media/dvb-frontends/s5h1409.c              |    6 -
 drivers/media/dvb-frontends/s5h1409.h              |    5 -
 drivers/media/dvb-frontends/s5h1411.c              |    5 -
 drivers/media/dvb-frontends/s5h1411.h              |    5 -
 drivers/media/dvb-frontends/si2168.c               |  317 +-
 drivers/media/dvb-frontends/si2168.h               |    6 +-
 drivers/media/dvb-frontends/si2168_priv.h          |    3 +-
 drivers/media/dvb-frontends/stb0899_algo.c         |    5 +-
 drivers/media/dvb-frontends/stb0899_drv.c          |    7 +-
 drivers/media/dvb-frontends/tc90522.c              |    1 +
 drivers/media/i2c/Kconfig                          |    9 +-
 drivers/media/i2c/adv7180.c                        | 1010 ++++-
 drivers/media/i2c/adv7604.c                        |   76 -
 drivers/media/i2c/adv7842.c                        |  184 +-
 drivers/media/i2c/m5mols/m5mols_core.c             |    9 +-
 drivers/media/i2c/msp3400-driver.c                 |    8 -
 drivers/media/i2c/mt9m032.c                        |   42 +-
 drivers/media/i2c/mt9p031.c                        |   41 +-
 drivers/media/i2c/mt9t001.c                        |   41 +-
 drivers/media/i2c/mt9v032.c                        |   43 +-
 drivers/media/i2c/s5k4ecgx.c                       |   11 +-
 drivers/media/i2c/s5k5baf.c                        |   13 +-
 drivers/media/i2c/s5k6aa.c                         |   46 +-
 drivers/media/i2c/smiapp-pll.c                     |    7 +-
 drivers/media/i2c/smiapp-pll.h                     |    8 -
 drivers/media/i2c/smiapp/smiapp-core.c             |  386 +-
 drivers/media/i2c/smiapp/smiapp-limits.c           |    6 -
 drivers/media/i2c/smiapp/smiapp-limits.h           |    6 -
 drivers/media/i2c/smiapp/smiapp-quirk.c            |   14 +-
 drivers/media/i2c/smiapp/smiapp-quirk.h            |   24 +-
 drivers/media/i2c/smiapp/smiapp-reg-defs.h         |    6 -
 drivers/media/i2c/smiapp/smiapp-reg.h              |    6 -
 drivers/media/i2c/smiapp/smiapp-regs.c             |    6 -
 drivers/media/i2c/smiapp/smiapp-regs.h             |    6 -
 drivers/media/i2c/smiapp/smiapp.h                  |    7 -
 drivers/media/i2c/soc_camera/ov2640.c              |   82 +-
 drivers/media/i2c/ths8200.c                        |   10 -
 drivers/media/mmc/siano/Kconfig                    |    2 +
 drivers/media/pci/bt8xx/Kconfig                    |    4 +-
 drivers/media/pci/bt8xx/Makefile                   |    2 +-
 drivers/media/pci/bt8xx/bt878.c                    |    6 -
 drivers/media/{common => pci/bt8xx}/btcx-risc.c    |   36 +-
 drivers/media/pci/bt8xx/btcx-risc.h                |   26 +
 drivers/media/pci/bt8xx/bttv-cards.c               |  324 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |   44 +-
 drivers/media/pci/bt8xx/bttv-gpio.c                |    6 -
 drivers/media/pci/bt8xx/bttv-if.c                  |    6 -
 drivers/media/pci/bt8xx/bttv-risc.c                |    6 -
 drivers/media/pci/bt8xx/bttv-vbi.c                 |    7 -
 drivers/media/pci/bt8xx/bttv.h                     |    5 -
 drivers/media/pci/bt8xx/bttvp.h                    |   20 +-
 drivers/media/pci/cx23885/Kconfig                  |    1 +
 drivers/media/pci/cx23885/cx23885-cards.c          |   43 +
 drivers/media/pci/cx23885/cx23885-dvb.c            |  376 +-
 drivers/media/pci/cx23885/cx23885-i2c.c            |    4 +-
 drivers/media/pci/cx23885/cx23885.h                |    3 +-
 drivers/media/pci/cx25821/Kconfig                  |    3 +-
 drivers/media/pci/cx25821/Makefile                 |    3 +-
 drivers/media/pci/cx25821/cx25821-alsa.c           |  113 +-
 drivers/media/pci/cx25821/cx25821-core.c           |  112 +-
 drivers/media/pci/cx25821/cx25821-video.c          |  685 +--
 drivers/media/pci/cx25821/cx25821.h                |   48 +-
 drivers/media/pci/cx88/cx88-blackbird.c            |    3 -
 drivers/media/pci/cx88/cx88-core.c                 |    7 -
 drivers/media/pci/cx88/cx88-dvb.c                  |    4 +-
 drivers/media/pci/cx88/cx88-mpeg.c                 |    7 -
 drivers/media/pci/cx88/cx88-tvaudio.c              |    7 -
 drivers/media/pci/ivtv/ivtv-irq.c                  |   22 +-
 drivers/media/pci/mantis/mantis_core.c             |   23 -
 drivers/media/pci/saa7134/saa7134-video.c          |    5 -
 drivers/media/pci/smipcie/smipcie.c                |   12 +-
 drivers/media/pci/solo6x10/solo6x10-core.c         |    4 +-
 drivers/media/pci/solo6x10/solo6x10-eeprom.c       |    2 +-
 drivers/media/pci/solo6x10/solo6x10-enc.c          |    6 +-
 drivers/media/pci/solo6x10/solo6x10-g723.c         |    4 +-
 drivers/media/pci/solo6x10/solo6x10-jpeg.h         |    4 +-
 drivers/media/pci/solo6x10/solo6x10-tw28.c         |    4 +-
 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |   48 +-
 drivers/media/pci/solo6x10/solo6x10.h              |    6 +-
 drivers/media/pci/sta2x11/Kconfig                  |    1 +
 drivers/media/pci/ttpci/av7110.c                   |    5 +-
 drivers/media/pci/ttpci/budget-core.c              |   89 +-
 drivers/media/pci/tw68/tw68.h                      |    1 -
 drivers/media/platform/Kconfig                     |   11 +-
 drivers/media/platform/Makefile                    |    2 +
 drivers/media/platform/am437x/Kconfig              |   11 +
 drivers/media/platform/am437x/Makefile             |    3 +
 drivers/media/platform/am437x/am437x-vpfe.c        | 2776 +++++++++++++
 drivers/media/platform/am437x/am437x-vpfe.h        |  283 ++
 drivers/media/platform/am437x/am437x-vpfe_regs.h   |  140 +
 drivers/media/platform/coda/coda-bit.c             |   25 +-
 drivers/media/platform/coda/coda-common.c          |  165 +-
 drivers/media/platform/coda/coda.h                 |    2 +-
 drivers/media/platform/coda/coda_regs.h            |    4 +-
 drivers/media/platform/davinci/Kconfig             |    6 +-
 drivers/media/platform/exynos-gsc/gsc-core.h       |   12 -
 drivers/media/platform/exynos-gsc/gsc-m2m.c        |    6 +-
 drivers/media/platform/marvell-ccic/Kconfig        |    3 +-
 drivers/media/platform/marvell-ccic/mcam-core.c    |    1 -
 drivers/media/platform/omap3isp/isp.c              |    3 +
 drivers/media/platform/s3c-camif/camif-capture.c   |   17 +-
 drivers/media/platform/s5p-g2d/g2d.c               |    1 -
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |    1 +
 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |   23 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   21 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |    6 +-
 drivers/media/platform/s5p-tv/mixer_video.c        |   21 +-
 drivers/media/platform/sh_veu.c                    |   35 +-
 drivers/media/platform/soc_camera/atmel-isi.c      |    7 +-
 drivers/media/platform/soc_camera/mx3_camera.c     |    7 +-
 drivers/media/platform/soc_camera/rcar_vin.c       |   94 +-
 .../platform/soc_camera/sh_mobile_ceu_camera.c     |    7 +-
 drivers/media/platform/soc_camera/soc_camera.c     |   18 -
 drivers/media/platform/ti-vpe/vpe.c                |  162 +-
 drivers/media/platform/vivid/vivid-ctrls.c         |    4 +-
 drivers/media/platform/vivid/vivid-tpg.c           |   10 +-
 drivers/media/platform/vivid/vivid-tpg.h           |    1 -
 drivers/media/platform/vsp1/vsp1.h                 |   14 +-
 drivers/media/platform/vsp1/vsp1_bru.c             |    2 +-
 drivers/media/platform/vsp1/vsp1_drv.c             |   81 +-
 drivers/media/platform/vsp1/vsp1_hsit.c            |    5 -
 drivers/media/platform/vsp1/vsp1_regs.h            |    4 +-
 drivers/media/platform/vsp1/vsp1_rpf.c             |   18 +
 drivers/media/platform/vsp1/vsp1_rwpf.h            |    1 +
 drivers/media/platform/vsp1/vsp1_wpf.c             |   13 +-
 drivers/media/radio/radio-aimslab.c                |    4 +-
 drivers/media/radio/tea575x.c                      |   41 +-
 drivers/media/radio/wl128x/fmdrv_rx.c              |   16 -
 drivers/media/radio/wl128x/fmdrv_rx.h              |    1 -
 drivers/media/rc/img-ir/Kconfig                    |   15 +
 drivers/media/rc/img-ir/Makefile                   |    2 +
 drivers/media/rc/img-ir/img-ir-hw.c                |   84 +-
 drivers/media/rc/img-ir/img-ir-hw.h                |   24 +-
 drivers/media/rc/img-ir/img-ir-jvc.c               |    8 +-
 drivers/media/rc/img-ir/img-ir-nec.c               |   24 +-
 drivers/media/rc/img-ir/img-ir-rc5.c               |   88 +
 drivers/media/rc/img-ir/img-ir-rc6.c               |  117 +
 drivers/media/rc/img-ir/img-ir-sanyo.c             |    8 +-
 drivers/media/rc/img-ir/img-ir-sharp.c             |    8 +-
 drivers/media/rc/img-ir/img-ir-sony.c              |   12 +-
 drivers/media/rc/lirc_dev.c                        |    6 +-
 drivers/media/rc/rc-main.c                         |   14 +-
 drivers/media/rc/sunxi-cir.c                       |   46 +-
 drivers/media/tuners/mt20xx.c                      |    8 -
 drivers/media/tuners/mt2131.c                      |    5 -
 drivers/media/tuners/mt2131.h                      |    5 -
 drivers/media/tuners/mt2131_priv.h                 |    5 -
 drivers/media/tuners/mxl5007t.c                    |    8 -
 drivers/media/tuners/mxl5007t.h                    |    9 -
 drivers/media/tuners/si2157.c                      |  189 +-
 drivers/media/tuners/si2157_priv.h                 |    3 +-
 drivers/media/tuners/tda18271-fe.c                 |    8 -
 drivers/media/tuners/tda18271-maps.c               |    8 -
 drivers/media/tuners/tda18271-priv.h               |    8 -
 drivers/media/tuners/tda827x.c                     |    8 -
 drivers/media/tuners/tda8290.c                     |    8 -
 drivers/media/tuners/tda9887.c                     |    8 -
 drivers/media/tuners/tuner-simple.c                |    8 -
 drivers/media/usb/au0828/Kconfig                   |    2 +-
 drivers/media/usb/au0828/au0828-cards.c            |    2 +-
 drivers/media/usb/au0828/au0828-vbi.c              |  122 +-
 drivers/media/usb/au0828/au0828-video.c            |  976 ++---
 drivers/media/usb/au0828/au0828.h                  |   61 +-
 drivers/media/usb/cx231xx/cx231xx-cards.c          |    9 +-
 drivers/media/usb/cx231xx/cx231xx-video.c          |    1 -
 drivers/media/usb/cx231xx/cx231xx.h                |   10 +-
 drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    2 +
 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        |    1 +
 drivers/media/usb/dvb-usb-v2/lmedm04.c             |  336 +-
 drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c      |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h      |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c       |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h       |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c        |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h        |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c        |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h        |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h        |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c      |    8 -
 drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h      |    9 -
 drivers/media/usb/dvb-usb-v2/mxl111sf.c            |    6 -
 drivers/media/usb/dvb-usb-v2/mxl111sf.h            |    6 -
 drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |  940 +++--
 drivers/media/usb/dvb-usb-v2/rtl28xxu.h            |   27 +-
 drivers/media/usb/dvb-usb/m920x.c                  |    5 -
 drivers/media/usb/em28xx/em28xx-audio.c            |    8 +-
 drivers/media/usb/em28xx/em28xx-core.c             |    4 +-
 drivers/media/usb/em28xx/em28xx-dvb.c              |   14 +-
 drivers/media/usb/em28xx/em28xx-input.c            |    9 +-
 drivers/media/usb/em28xx/em28xx-video.c            |    7 +-
 drivers/media/usb/gspca/Kconfig                    |   10 +
 drivers/media/usb/gspca/Makefile                   |    2 +
 drivers/media/usb/gspca/gspca.c                    |    2 +-
 drivers/media/usb/gspca/ov534.c                    |   10 +-
 drivers/media/usb/gspca/stv06xx/stv06xx.c          |    4 +-
 drivers/media/usb/gspca/touptek.c                  |  731 ++++
 drivers/media/usb/gspca/vc032x.c                   |   10 +-
 drivers/media/usb/pvrusb2/pvrusb2-audio.c          |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-audio.h          |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-context.c        |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-context.h        |    9 -
 drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c       |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h       |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-ctrl.c           |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-ctrl.h           |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c    |   12 -
 drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h    |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-debug.h          |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-debugifc.c       |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-debugifc.h       |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-devattr.c        |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-devattr.h        |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-eeprom.c         |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-eeprom.h         |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-encoder.c        |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-encoder.h        |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h        |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h   |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |   50 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.h            |   13 -
 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c       |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h       |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-io.c             |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-io.h             |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-ioread.c         |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-ioread.h         |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-main.c           |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-std.c            |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-std.h            |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-sysfs.c          |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-sysfs.h          |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-util.h           |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-v4l2.c           |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-v4l2.h           |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c      |   11 -
 drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h      |   10 -
 drivers/media/usb/pvrusb2/pvrusb2-wm8775.c         |   12 -
 drivers/media/usb/pvrusb2/pvrusb2-wm8775.h         |   10 -
 drivers/media/usb/pvrusb2/pvrusb2.h                |   10 -
 drivers/media/usb/pwc/pwc-if.c                     |   12 +-
 drivers/media/usb/s2255/s2255drv.c                 |    4 +-
 drivers/media/usb/siano/Kconfig                    |    2 +
 drivers/media/usb/stk1160/stk1160-v4l.c            |    5 -
 drivers/media/usb/stkwebcam/stk-webcam.c           |    1 -
 drivers/media/usb/tm6000/tm6000-video.c            |    3 +-
 drivers/media/usb/usbvision/usbvision-core.c       |   13 +-
 drivers/media/usb/usbvision/usbvision-i2c.c        |    8 -
 drivers/media/usb/usbvision/usbvision-video.c      |    8 -
 drivers/media/usb/usbvision/usbvision.h            |    8 -
 drivers/media/usb/uvc/uvc_driver.c                 |    5 +
 drivers/media/usb/uvc/uvc_queue.c                  |   19 +-
 drivers/media/usb/uvc/uvc_v4l2.c                   |    1 -
 drivers/media/usb/uvc/uvc_video.c                  |    6 +-
 drivers/media/usb/uvc/uvcvideo.h                   |    3 +
 drivers/media/usb/zr364xx/zr364xx.c                |    2 -
 drivers/media/v4l2-core/v4l2-dev.c                 |   35 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |   10 +-
 drivers/media/v4l2-core/v4l2-subdev.c              |    8 -
 drivers/media/v4l2-core/videobuf-dma-sg.c          |   15 +-
 drivers/media/v4l2-core/videobuf2-vmalloc.c        |    9 +-
 drivers/staging/media/Kconfig                      |    6 -
 drivers/staging/media/Makefile                     |    4 -
 drivers/staging/media/bcm2048/radio-bcm2048.c      |    6 +-
 drivers/staging/media/davinci_vpfe/dm365_isif.c    |   69 +-
 drivers/staging/media/lirc/lirc_serial.c           |   10 +-
 drivers/staging/media/lirc/lirc_zilog.c            |  118 +-
 drivers/staging/media/mn88472/mn88472.c            |   63 +-
 drivers/staging/media/mn88472/mn88472_priv.h       |    1 +
 drivers/staging/media/omap4iss/iss.c               |  111 +-
 drivers/staging/media/omap4iss/iss_csi2.c          |   43 +-
 drivers/staging/media/omap4iss/iss_csi2.h          |    2 +-
 drivers/staging/media/omap4iss/iss_ipipeif.c       |   22 +-
 drivers/staging/media/omap4iss/iss_regs.h          |    2 +
 drivers/staging/media/omap4iss/iss_resizer.c       |   18 +-
 drivers/staging/media/omap4iss/iss_video.c         |   16 +-
 drivers/staging/media/parport/Kconfig              |   69 -
 drivers/staging/media/parport/Makefile             |    4 -
 drivers/staging/media/parport/bw-qcam.c            | 1177 ------
 drivers/staging/media/parport/c-qcam.c             |  882 ----
 drivers/staging/media/parport/pms.c                | 1156 ------
 drivers/staging/media/parport/w9966.c              |  980 -----
 drivers/staging/media/tlg2300/Kconfig              |   21 -
 drivers/staging/media/tlg2300/Makefile             |    9 -
 drivers/staging/media/tlg2300/pd-alsa.c            |  337 --
 drivers/staging/media/tlg2300/pd-common.h          |  271 --
 drivers/staging/media/tlg2300/pd-dvb.c             |  597 ---
 drivers/staging/media/tlg2300/pd-main.c            |  553 ---
 drivers/staging/media/tlg2300/pd-radio.c           |  339 --
 drivers/staging/media/tlg2300/pd-video.c           | 1570 -------
 drivers/staging/media/tlg2300/vendorcmds.h         |  243 --
 drivers/staging/media/vino/Kconfig                 |   24 -
 drivers/staging/media/vino/Makefile                |    3 -
 drivers/staging/media/vino/indycam.c               |  378 --
 drivers/staging/media/vino/indycam.h               |   93 -
 drivers/staging/media/vino/saa7191.c               |  649 ---
 drivers/staging/media/vino/saa7191.h               |  245 --
 drivers/staging/media/vino/vino.c                  | 4345 --------------------
 drivers/staging/media/vino/vino.h                  |  138 -
 drivers/video/hdmi.c                               |  822 +++-
 include/linux/hdmi.h                               |   37 +-
 include/linux/platform_data/vsp1.h                 |   27 -
 include/media/smiapp.h                             |   10 +-
 include/media/tea575x.h                            |    5 +
 include/media/v4l2-dev.h                           |    3 +-
 include/media/v4l2-ioctl.h                         |   15 +-
 include/media/v4l2-subdev.h                        |    6 -
 include/media/videobuf-dma-sg.h                    |    8 -
 include/media/videobuf-dvb.h                       |    6 -
 include/uapi/linux/Kbuild                          |    1 +
 include/uapi/linux/am437x-vpfe.h                   |  122 +
 include/uapi/linux/v4l2-controls.h                 |    4 +
 include/uapi/linux/videodev2.h                     |   17 +-
 357 files changed, 12056 insertions(+), 21671 deletions(-)
 create mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml
 create mode 100644 Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
 create mode 100644 Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt
 delete mode 100644 Documentation/video4linux/CQcam.txt
 delete mode 100644 Documentation/video4linux/README.tlg2300
 delete mode 100644 Documentation/video4linux/w9966.txt
 rename drivers/media/{common => pci/bt8xx}/btcx-risc.c (90%)
 create mode 100644 drivers/media/pci/bt8xx/btcx-risc.h
 create mode 100644 drivers/media/platform/am437x/Kconfig
 create mode 100644 drivers/media/platform/am437x/Makefile
 create mode 100644 drivers/media/platform/am437x/am437x-vpfe.c
 create mode 100644 drivers/media/platform/am437x/am437x-vpfe.h
 create mode 100644 drivers/media/platform/am437x/am437x-vpfe_regs.h
 create mode 100644 drivers/media/rc/img-ir/img-ir-rc5.c
 create mode 100644 drivers/media/rc/img-ir/img-ir-rc6.c
 create mode 100644 drivers/media/usb/gspca/touptek.c
 delete mode 100644 drivers/staging/media/parport/Kconfig
 delete mode 100644 drivers/staging/media/parport/Makefile
 delete mode 100644 drivers/staging/media/parport/bw-qcam.c
 delete mode 100644 drivers/staging/media/parport/c-qcam.c
 delete mode 100644 drivers/staging/media/parport/pms.c
 delete mode 100644 drivers/staging/media/parport/w9966.c
 delete mode 100644 drivers/staging/media/tlg2300/Kconfig
 delete mode 100644 drivers/staging/media/tlg2300/Makefile
 delete mode 100644 drivers/staging/media/tlg2300/pd-alsa.c
 delete mode 100644 drivers/staging/media/tlg2300/pd-common.h
 delete mode 100644 drivers/staging/media/tlg2300/pd-dvb.c
 delete mode 100644 drivers/staging/media/tlg2300/pd-main.c
 delete mode 100644 drivers/staging/media/tlg2300/pd-radio.c
 delete mode 100644 drivers/staging/media/tlg2300/pd-video.c
 delete mode 100644 drivers/staging/media/tlg2300/vendorcmds.h
 delete mode 100644 drivers/staging/media/vino/Kconfig
 delete mode 100644 drivers/staging/media/vino/Makefile
 delete mode 100644 drivers/staging/media/vino/indycam.c
 delete mode 100644 drivers/staging/media/vino/indycam.h
 delete mode 100644 drivers/staging/media/vino/saa7191.c
 delete mode 100644 drivers/staging/media/vino/saa7191.h
 delete mode 100644 drivers/staging/media/vino/vino.c
 delete mode 100644 drivers/staging/media/vino/vino.h
 delete mode 100644 include/linux/platform_data/vsp1.h
 create mode 100644 include/uapi/linux/am437x-vpfe.h

2014-12-09

[GIT PULL for v3.19-rc1] media updates

Subject: [GIT PULL for v3.19-rc1] media updates
Date: Tue, 9 Dec 2014 14:09:40 -0200
From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Organization: Samsung
To: Linus Torvalds <torvalds@linux-foundation.org>
CC: Andrew Morton <akpm@linux-foundation.org>, Linux Media Mailing List <linux-media@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>

Hi Linus,

Please pull from:
  git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v3.19-rc1


For:
  - Two new dvb frontend drivers: mn88472 and mn88473;
  - A new driver for some PCIe DVBSky cards;
  - A new remote controller driver: meson-ir;
  - One LIRC staging driver got rewritten and promoted to mainstream:
    igorplugusb;
  - A new tuner driver (m88rs6000t);
  - The old omap2 media driver got removed from staging. This driver uses
    an old DMA API and it is likely broken on recent kernels. Nobody cared
    enough to fix it;
  - Media bus format moved to a separate header, as DRM will also use the
    definitions there;
  - mem2mem_testdev were renamed to vim2m, in order to use the same naming
    convention taken by the other virtual test driver (vivid);
  - Added a new driver for coda SoC (coda-jpeg);
  - The cx88 driver got converted to use videobuf2 core;
  - Make DMABUF export buffer to work with DMA Scatter/Gather and Vmalloc
    cores;
  - Lots of other fixes, improvements and cleanups on the drivers.

Thanks!
Mauro

The following changes since commit 206c5f60a3d902bc4b56dab2de3e88de5eb06108:

  Linux 3.18-rc4 (2014-11-09 14:55:29 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v3.19-rc1

for you to fetch changes up to 71947828caef0c83d4245f7d1eaddc799b4ff1d1:

  [media] mn88473: One function call less in mn88473_init() after error (2014-12-04 16:00:47 -0200)

----------------------------------------------------------------
media updates for v3.19-rc1

----------------------------------------------------------------
Amber Thrall (1):
      [media] Staging: media: lirc: cleaned up packet dump in 2 files

Andreas Ruprecht (1):
      [media] media: pci: smipcie: Fix dependency for DVB_SMIPCIE

Andrey Utkin (4):
      [media] solo6x10: clean up properly in stop_streaming
      [media] solo6x10: free DMA allocation when releasing encoder
      [media] solo6x10: bind start & stop of encoded frames processing thread to device (de)init
      [media] solo6x10: don't turn off/on encoder interrupt in processing loop

Antti Palosaari (34):
      [media] si2168: do not print device is warm every-time when opened
      [media] af9033: fix AF9033 DVBv3 signal strength measurement
      [media] af9033: improve read_signal_strength error handling slightly
      [media] af9033: return 0.1 dB DVBv3 SNR for AF9030 family
      [media] af9033: continue polling unless critical IO error
      [media] mn88472: Panasonic MN88472 demod driver (DVB-C only)
      [media] mn88472: correct attach symbol name
      [media] mn88472: add small delay to wait DVB-C lock
      [media] mn88472: rename mn88472_c.c => mn88472.c
      [media] mn88472: rename state to dev
      [media] mn88472: convert driver to I2C client
      [media] mn88472: Convert driver to I2C RegMap API
      [media] mn88472: implement DVB-T and DVB-T2
      [media] mn88472: move to staging
      [media] mn88472: add staging TODO
      [media] MAINTAINERS: add mn88472 (Panasonic MN88472)
      [media] mn88473: Panasonic MN88473 DVB-T/T2/C demod driver
      [media] mn88473: add support for DVB-T2
      [media] mn88473: implement DVB-T mode
      [media] mn88473: improve IF frequency and BW handling
      [media] mn88473: convert driver to I2C binding
      [media] mn88473: convert to RegMap API
      [media] mn88473: move to staging
      [media] mn88473: add staging TODO
      [media] MAINTAINERS: add mn88473 (Panasonic MN88473)
      [media] r820t: add DVB-C config
      [media] rtl28xxu: enable demod ADC only when needed
      [media] rtl2832: implement option to bypass slave demod TS
      [media] rtl28xxu: add support for Panasonic MN88472 slave demod
      [media] rtl28xxu: add support for Panasonic MN88473 slave demod
      [media] rtl28xxu: rename tuner I2C client pointer
      [media] rtl28xxu: remove unused SDR attach logic
      [media] rtl28xxu: add SDR module for devices having R828D tuner
      [media] rtl2832_sdr: control ADC

Arun Mankuzhi (2):
      [media] s5p-mfc: modify mfc wakeup sequence for V8
      [media] s5p-mfc: De-init MFC when watchdog kicks in

Austin Lund (1):
      [media] media/rc: Send sync space information on the lirc device

Behan Webster (1):
      [media] ti-fpe: LLVMLinux: Remove nested function from ti-vpe

Beniamino Galvani (3):
      [media] media: rc: meson: document device tree bindings
      [media] media: rc: add driver for Amlogic Meson IR remote receiver
      [media] ARM: dts: meson: add IR receiver node

Bimow Chen (2):
      [media] af9033: fix DVBv3 signal strength value not correct issue
      [media] af9033: fix DVBv3 snr value not correct issue

Boris BREZILLON (10):
      [media] Move mediabus format definition to a more standard place
      [media] v4l: Update subdev-formats doc with new MEDIA_BUS_FMT values
      [media] Make use of the new media_bus_format definitions
      [media] i2c: Make use of media_bus_format enum
      [media] pci: Make use of MEDIA_BUS_FMT definitions
      [media] platform: Make use of media_bus_format enum
      [media] usb: Make use of media_bus_format enum
      [media] staging: media: Make use of MEDIA_BUS_FMT_ definitions
      [media] gpu: ipu-v3: Make use of media_bus_format enum
      [media] v4l: Forbid usage of V4L2_MBUS_FMT definitions inside the kernel

Christian Resell (1):
      [media] staging: media: bcm2048: fix coding style error

CrazyCat (3):
      [media] si2157: Si2148 support
      [media] si2168: TS clock inversion control
      [media] cxusb: Geniatech T230 support

Dan Carpenter (2):
      [media] media: dvb_core: replace a magic number by a macro
      [media] stv090x: remove indent levels in stv090x_get_coldlock()

Dmitry Torokhov (1):
      [media] exynos4-is: fix error handling of irq_of_parse_and_map

Dylan Rajaratnam (1):
      [media] img-ir/hw: Always read data to clear buffer

Fabio Estevam (2):
      [media] coda: Call v4l2_device_unregister() from a single location
      [media] coda: Unregister v4l2 upon alloc_workqueue() error

Felipe Balbi (1):
      [media] arm: omap2: rx51-peripherals: fix build warning

Frank Schaefer (1):
      [media] af9005: fix kernel panic on init if compiled without IR

Geert Uytterhoeven (1):
      [media] cx24117: Grammar s/if ... if/if ... is/

Guennadi Liakhovetski (1):
      [media] V4L2: fix VIDIOC_CREATE_BUFS 32-bit compatibility mode data copy-back

Hans Verkuil (66):
      [media] mem2mem_testdev: rename to vim2m
      [media] v4l2-ctrls: fix sparse warning
      [media] cx88: remove fmt from the buffer struct
      [media] cx88: drop the bogus 'queue' list in dmaqueue
      [media] cx88: drop videobuf abuse in cx88-alsa
      [media] cx88: convert to vb2
      [media] cx88: fix sparse warning
      [media] cx88: return proper errors during fw load
      [media] cx88: drop cx88_free_buffer
      [media] cx88: remove dependency on btcx-risc
      [media] cx88: increase API command timeout
      [media] cx88: don't pollute the kernel log
      [media] cx88: move width, height and field to core struct
      [media] cx88: drop mpeg_active field
      [media] cx88: don't allow changes while vb2_is_busy
      [media] cx88: consistently use UNSET for absent tuner
      [media] cx88: pci_disable_device comes after free_irq
      [media] cx88: fix VBI support
      [media] s5p-mfc: fix sparse error
      [media] bttv: fix sparse warning
      [media] videobuf: fix sparse warnings
      [media] smipcie: fix sparse warnings
      [media] stk1160: fix sparse warning
      [media] cxusb: fix sparse warnings
      [media] ti-vpe: fix sparse warnings
      [media] vivid: add test array controls
      [media] adv7842: fix G/S_EDID behavior
      [media] adv7511: fix G/S_EDID behavior
      [media] adv7604: Correct G/S_EDID behaviour
      [media] saa7164: fix sparse warnings
      [media] mach-omap2: remove deprecated VIDEO_OMAP2 support
      [media] omap24xx/tcm825x: remove deprecated omap2 camera drivers.
      [media] staging/media/Makefile: drop omap24xx reference
      [media] bttv/cx25821/cx88/ivtv: use sg_next instead of sg++
      [media] v4l2-dev: vdev->v4l2_dev is always set, so simplify code
      [media] v4l2-common: remove unused helper functions
      [media] v4l2-ctrl: move function prototypes from common.h to ctrls.h
      [media] v4l2-common: move v4l2_ctrl_check to cx2341x
      [media] videobuf2-core.h: improve documentation
      [media] vb2: replace 'write' by 'dma_dir'
      [media] vb2: add dma_dir to the alloc memop
      [media] vb2: don't free alloc context if it is ERR_PTR
      [media] vb2-dma-sg: add allocation context to dma-sg
      [media] vb2-dma-sg: move dma_(un)map_sg here
      [media] vb2-dma-sg: add dmabuf import support
      [media] vb2-dma-sg: add support for dmabuf exports
      [media] vb2-vmalloc: add support for dmabuf exports
      [media] vivid: enable vb2_expbuf support
      [media] vim2m: support expbuf
      [media] vb2: use dma_map_sg_attrs to prevent unnecessary sync
      [media] videodev2.h: improve colorspace support
      [media] v4l2-mediabus: improve colorspace support
      [media] v4l2-ioctl.c: log the new ycbcr_enc and quantization fields
      [media] DocBook media: rewrite the Colorspace chapter
      [media] vivid-tpg-colors: add AdobeRGB and BT.2020 support
      [media] vivid-tpg: improve colorspace support
      [media] vivid: add new colorspaces
      [media] vivid: add support for YCbCr encoding and quantization
      [media] adv7511: improve colorspace handling
      [media] cx18: add device_caps support
      [media] staging/media: fix querycap
      [media] media/usb,pci: fix querycap
      [media] media/radio: fix querycap
      [media] media/platform: fix querycap
      [media] media/platform: fix querycap
      [media] omap_vout: fix compile warnings

Ilja Friedel (1):
      [media] s5p-mfc: Only set timestamp/timecode for new frames

James Hogan (5):
      [media] img-ir/hw: Fix potential deadlock stopping timer
      [media] img-ir/hw: Drop [un]register_decoder declarations
      [media] img-ir: Depend on METAG or MIPS or COMPILE_TEST
      [media] img-ir: Don't set driver's module owner
      [media] MAINTAINERS: Add myself as img-ir maintainer

Joe Perches (3):
      [media] media: earthsoft: logging neatening
      [media] dvb-net: Fix probable mask then right shift defects
      [media] cx25840/cx18: Use standard ordering of mask and shift

Johann Klammer (1):
      [media] saa7146: turn bothersome error into a debug message

Jose Alberto Reguero (2):
      [media] [PATH,1/2] mxl5007 move reset to attach
      [media] [PATH,2/2] mxl5007 move loop_thru to attach

Josh Wu (2):
      [media] media: v4l2-image-sizes.h: add SVGA, XGA and UXGA size definitions
      [media] media: v4l2-image-sizes.h: correct the SVGA height definition

Kiran AVND (4):
      [media] s5p-mfc: support MIN_BUFFERS query for encoder
      [media] s5p-mfc: keep RISC ON during reset for V7/V8
      [media] s5p-mfc: check mfc bus ctrl before reset
      [media] s5p-mfc: flush dpbs when resolution changes

Laurent Pinchart (12):
      [media] v4l2: get/set prio using video_dev prio structure
      [media] uvcvideo: Move to video_ioctl2
      [media] uvcvideo: Set buffer field to V4L2_FIELD_NONE
      [media] uvcvideo: Separate video and queue enable/disable operations
      [media] uvcvideo: Add function to convert from queue to stream
      [media] uvcvideo: Implement vb2 queue start and stop stream operations
      [media] uvcvideo: Don't stop the stream twice at file handle release
      [media] uvcvideo: Rename uvc_alloc_buffers to uvc_request_buffers
      [media] uvcvideo: Rename and split uvc_queue_enable to uvc_queue_stream(on|off)
      [media] uvcvideo: Return all buffers to vb2 at stream stop and start failure
      [media] v4l: vb2: Fix race condition in vb2_fop_poll
      [media] v4l: vb2: Fix race condition in _vb2_fop_release

Markus Elfring (16):
      [media] DVB-frontends: Deletion of unnecessary checks before the function call "release_firmware"
      [media] m88ds3103: One function call less in m88ds3103_init() after error detection
      [media] si2168: One function call less in si2168_init() after error detection
      [media] firewire: Deletion of an unnecessary check before the function call "dvb_unregister_device"
      [media] i2c: Deletion of an unnecessary check before the function call "rc_unregister_device"
      [media] rc: Deletion of unnecessary checks before two function calls
      [media] platform: Deletion of unnecessary checks before two function calls
      [media] USB: Deletion of unnecessary checks before three function calls
      [media] siano: unnecessary check before rc_unregister_device()
      [media] V4L2: Deletion of an unnecessary check before the function call "vb2_put_vma"
      [media] tuners: remove uneeded checks before release_firmware()
      [media] si2157: One function call less in si2157_init() after error
      [media] ddbridge: remove unneeded check before dvb_unregister_device()
      [media] lirc_zilog: Deletion of unnecessary checks before vfree()
      [media] mn88473: Remove uneeded check before release_firmware()
      [media] mn88473: One function call less in mn88473_init() after error

Martin Kaiser (1):
      [media] lirc: use kfifo_initialized() on lirc_buffer's fifo

Matthias Schwarzott (16):
      [media] cx231xx: let i2c bus scanning use its own i2c_client
      [media] cx231xx: use own i2c_client for eeprom access
      [media] cx231xx: delete i2c_client per bus
      [media] cx231xx: give each master i2c bus a seperate name
      [media] cx231xx: Modifiy the symbolic constants for i2c ports and describe
      [media] cx231xx: Use symbolic constants for i2c ports instead of numbers
      [media] cx231xx: add wrapper to get the i2c_adapter pointer
      [media] cx231xx: remember status of i2c port_3 switch
      [media] cx231xx: let is_tuner check the real i2c port and not the i2c master number
      [media] cx231xx: change usage of I2C_1 to the real i2c port
      [media] cx231xx: register i2c mux adapters for bus 1
      [media] cx231xx: drop unconditional port3 switching
      [media] cx231xx: scan all four existing i2c busses instead of the 3 masters
      [media] cx231xx: remove direct register PWR_CTL_EN modification that switches port3
      [media] cx231xx: use 1 byte read for i2c scan
      [media] tveeprom: Update list of chips and extend serial number to 32bits

Mauro Carvalho Chehab (48):
      Merge tag 'v3.18-rc1' into patchwork
      Merge remote-tracking branch 'linus/master' into patchwork
      [media] s5p-mfc: declare s5p_mfc_bus_reset as static
      [media] dib7000p: get rid of an unused argument
      [media] Documentation: FE_SET_PROPERTY requires R/W
      [media] drxk: Fix debug printks
      [media] em28xx-dvb: remove unused mfe_sharing
      [media] sound: simplify au0828 quirk table
      [media] sound: Update au0828 quirks table
      [media] Update Documentation cardlist
      [media] fix a warning on avr32 arch
      [media] cx231xx: get rid of driver-defined printk macros
      [media] cx231xx: Fix identation
      [media] cx231xx: Cleanup printk at the driver
      [media] cx25840: Don't report an error if max size is adjusted
      [media] cx25840: convert max_buf_size var to lowercase
      [media] cx231xx: disable I2C errors during i2c_scan
      [media] cx231xx: convert from pr_foo to dev_foo
      [media] cx231xx: get rid of audio debug parameter
      [media] cx231xx: use dev_foo instead of printk
      [media] cx231xx: add addr for demod and make i2c_devs const
      [media] cx231xx: use dev_info() for extension load/unload
      [media] cx231xx: too much changes. Bump version number
      [media] cx231xx: simplify I2C scan debug messages
      [media] cx231xx: Improve the log message
      [media] cx23885-dvb: Fix some issues at the DVB error handling
      [media] smipcie: fix two small CodingStyle issues
      [media] cx231xx: Remove a bogus check for NULL
      [media] af0933: Don't go past arrays
      [media] stv090x: Fix delivery system setting
      [media] rc-main: Fix rc_type handling
      [media] stb0899: don't go past DiSEqC msg buffer
      [media] cx22700: Fix potential buffer overflow
      [media] cx24110: Fix a spatch warning
      [media] cx24110: Fix whitespaces at cx24110_set_fec()
      [media] cx23110: Fix return code for cx24110_set_fec()
      [media] cx24110: Simplify error handling at cx24110_set_fec()
      Merge tag 'v3.18-rc4' into patchwork
      [media] lmed04: add missing breaks
      Revert "[media] lmed04: add missing breaks"
      [media] omap: disable COMPILE_TEST
      [media] media: exynos-gsc: fix build warning
      [media] stv090x: remove export symbol for stv090x_set_gpio()
      [media] tda18271: Fix identation
      [media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups
      [media] stv090x: Some whitespace cleanups
      [media] stv090x: Remove an unreachable code
      [media] stv090x: add an extra protetion against buffer overflow

Nibble Max (7):
      [media] cx23885: add DVBSky T982(Dual DVB-T2/T/C) support
      [media] dvb-usb-dvbsky: add T680CI dvb-t2/t/c usb ci box support
      [media] smipcie: use add_i2c_client and del_i2c_client functions
      [media] smipcie: add DVBSky T9580 V3 support
      [media] dvb-usb-dvbsky: add T330 dvb-t2/t/c usb stick support
      [media] cxusb: remove TechnoTrend CT2-4400 and CT2-4650 devices
      [media] dvb-usb-dvbsky: add TechnoTrend CT2-4400 and CT2-4650 devices support

Olli Salonen (19):
      [media] si2157: add support for SYS_DVBC_ANNEX_B
      [media] cx23855: add support for DVBSky T980C (no CI support)
      [media] sp2: fix incorrect struct
      [media] sp2: improve debug logging
      [media] cx23885: add I2C client for CI into state and handle unregistering
      [media] cx23855: add CI support for DVBSky T980C
      [media] dvbsky: don't print MAC address from read_mac_address
      [media] dvbsky: clean logging
      [media] dvbsky: add option to disable IR receiver
      [media] cxusb: TS mode setting for TT CT2-4400
      [media] cx23885: add support for TechnoTrend CT2-4500 CI
      [media] cxusb: initialize si2168_config struct
      [media] af9035: initialize si2168_config struct
      [media] em28xx: initialize si2168_config struct
      [media] si2157: Add support for Si2146-A10
      [media] em28xx: Add support for Terratec Cinergy T2 Stick HD
      [media] si2157: make checkpatch.pl happy (remove break after goto)
      [media] si2168: debug printout for firmware version
      [media] si2168: add support for firmware files in new format

Paul Bolle (1):
      [media] omap: Fix typo "HAS_MMU"

Pawel Osciak (5):
      [media] s5p-mfc: Fix REQBUFS(0) for encoder
      [media] s5p-mfc: Don't crash the kernel if the watchdog kicks in
      [media] s5p-mfc: Remove unused alloc field from private buffer struct
      [media] s5p-mfc: fix V4L2_CID_MIN_BUFFERS_FOR_CAPTURE on resolution change
      [media] s5p-mfc: fix a race in interrupt flags handling

Philipp Zabel (21):
      [media] coda: clear aborting flag in stop_streaming
      [media] coda: remove superfluous error message on devm_kzalloc failure
      [media] coda: add coda_write_base helper
      [media] coda: disable rotator if not needed
      [media] coda: simplify frame memory control register handling
      [media] coda: add support for partial interleaved YCbCr 4:2:0 (NV12) format
      [media] coda: add support for planar YCbCr 4:2:2 (YUV422P) format
      [media] coda: identify platform device earlier
      [media] coda: add coda_video_device descriptors
      [media] coda: split out encoder control setup to specify controls per video device
      [media] coda: add JPEG register definitions for CODA7541
      [media] coda: add CODA7541 JPEG support
      [media] coda: store bitstream buffer position with buffer metadata
      [media] coda: pad input stream for JPEG decoder
      [media] coda: try to only queue a single JPEG into the bitstream
      [media] coda: allow userspace to set compressed buffer size in a certain range
      [media] coda: set bitstream end flag in coda_release
      [media] coda: drop JPEG buffers not framed by SOI and EOI markers
      [media] coda: re-queue buffers if start_streaming fails
      [media] MAINTAINERS: add maintainer for CODA video4linux mem2mem driver
      [media] uvcvideo: Add quirk to force the Oculus DK2 IR tracker to grayscale

Prabhakar Lad (21):
      [media] media: davinci: vpbe: initialize vb2 queue and DMA context in probe
      [media] media: davinci: vpbe: drop buf_init() callback
      [media] media: davinci: vpbe: use vb2_ops_wait_prepare/finish helper functions
      [media] media: davinci: vpbe: drop buf_cleanup() callback
      [media] media: davinci: vpbe: improve vpbe_buffer_prepare() callback
      [media] media: davinci: vpbe: use vb2_fop_mmap/poll
      [media] media: davinci: vpbe: use fh handling provided by v4l
      [media] media: davinci: vpbe: use vb2_ioctl_* helpers
      [media] media: davinci: vpbe: add support for VB2_DMABUF
      [media] media: davinci: vpbe: add support for VIDIOC_EXPBUF
      [media] media: davinci: vpbe: use helpers provided by core if streaming is started
      [media] media: davinci: vpbe: drop unused member memory from vpbe_layer
      [media] media: davinci: vpbe: group v4l2_ioctl_ops
      [media] media: davinci: vpbe: return -ENODATA for *dv_timings/*_std calls
      [media] media: davinci: vpbe: add support for VIDIOC_CREATE_BUFS
      [media] media: vivid: use vb2_start_streaming_called() helper
      [media] media: cx88: use vb2_start_streaming_called() helper
      [media] media: vivid: use vb2_ops_wait_prepare/finish helper
      [media] media: marvell-ccic: use vb2_ops_wait_prepare/finish helper
      [media] media: blackfin: use vb2_ops_wait_prepare/finish helper
      [media] media: davinci: vpif_capture: use vb2_ops_wait_prepare/finish helper

Prathyush K (1):
      [media] s5p-mfc: clear 'enter_suspend' flag if suspend fails

Rasmus Villemoes (1):
      [media] s5p_mfc: Remove redundant casts

Richard Vollkommer (2):
      [media] xc5000: add IF output level control
      [media] au8522: improve lock performance with ZeeVee modulators

Sakari Ailus (25):
      [media] smiapp: Take mutex during PLL update in sensor initialisation
      [media] smiapp-pll: Correct clock debug prints
      [media] smiapp-pll: The clock tree values are unsigned --- fix debug prints
      [media] smiapp-pll: Separate bounds checking into a separate function
      [media] smiapp-pll: External clock frequency isn't an output value
      [media] smiapp-pll: Unify OP and VT PLL structs
      [media] smiapp-pll: Calculate OP clocks only for sensors that have them
      [media] smiapp-pll: Don't validate OP clocks if there are none
      [media] smiapp: The PLL calculator handles sensors with VT clocks only
      [media] smiapp: Remove validation of op_pix_clk_div
      [media] smiapp-pll: Add pixel rate in pixel array as output parameters
      [media] smiapp: Use actual pixel rate calculated by the PLL calculator
      [media] smiapp: Split calculating PLL with sensor's limits from updating it
      [media] smiapp: Gather information on valid link rate and BPP combinations
      [media] smiapp: Take valid link frequencies into account in supported mbus codes
      [media] smiapp: Clean up smiapp_set_format()
      [media] smiapp: Set valid link frequency range
      [media] smiapp: Update PLL when setting format
      [media] media: Print information on failed link validation
      [media] media: Fix a compiler warning in media_entity_pipeline_start()
      [media] v4l: Clean up sub-device format documentation
      [media] v4l: Add V4L2_SEL_TGT_NATIVE_SIZE selection target
      [media] v4l: Add input and output capability flags for native size setting
      [media] smiapp: Set left and top to zero for crop bounds selection
      [media] smiapp: Support V4L2_SEL_TGT_NATIVE_SIZE

Sean Young (3):
      [media] rc: port IgorPlug-USB to rc-core
      [media] lirc_igorplugusb: remove
      [media] redrat3: ensure dma is setup properly

Sebastian Reichel (8):
      [media] si4713: switch to devm regulator API
      [media] si4713: switch reset gpio to devm_gpiod API
      [media] si4713: use managed memory allocation
      [media] si4713: use managed irq request
      [media] si4713: add device tree support
      [media] si4713: add DT binding documentation
      [media] ARM: OMAP2: RX-51: update si4713 platform data
      [media] si4713: cleanup platform data

Shuah Khan (1):
      [media] media/au0828: Fix IR stop, poll to not access device during disconnect

Simon Farnsworth (1):
      [media] DocBook media: Clarify V4L2_FIELD_ANY for drivers

Sudip Mukherjee (1):
      [media] media: davinci: vpbe: missing clk_put

Takashi Iwai (1):
      [media] uvcvideo: Fix destruction order in uvc_delete()

Tomas Melin (1):
      [media] rc-main: fix lockdep splash for rc-main

Wilson Michaels (1):
      [media] add "lgdt330x" device name i2c_devs array

Witold Krecicki (1):
      [media] em28xx: add support for Leadtek VC100 USB capture device

ayaka (1):
      [media] s5p-mfc: correct the formats info for encoder

nibble.max (13):
      [media] cx23885: add IR for DVBSky T9580 Dual DVB-S2/T2/C PCIe card
      [media] dvb-usb-dvbsky: add s960ci dvb-s/s2 usb ci box support
      [media] cx23885: add DVBSky S950C dvb-s/s2 ci PCIe card support(no RC)
      [media] cx23885: add DVBSky S950C and T980C RC support
      [media] m88ts2022: return the err code in its probe function when error occurs
      [media] smipcie: SMI pcie bridge driver for DVBSky S950 V3 dvb-s/s2 cards
      [media] m88rs6000t: add new dvb-s/s2 tuner for integrated chip M88RS6000
      [media] m88ds3103: add support for the demod of M88RS6000
      [media] smipcie: add DVBSky S952 V3 support
      [media] cx23885: add DVBSky S950 support
      [media] cx23885: add DVBSky S952 support
      [media] m88ds3103: change ts clock config for serial mode
      [media] dvb-usb-dvbsky: fix i2c adapter for sp2 device

sensoray-dev (1):
      [media] s2255drv: fix spinlock issue

ほち (1):
      [media] dvb-frontends/Kconfig: better describe Toshiba TC90522

 Documentation/DocBook/media/dvb/dvbproperty.xml    |    4 +-
 Documentation/DocBook/media/v4l/biblio.xml         |   85 +
 Documentation/DocBook/media/v4l/dev-subdev.xml     |  109 +-
 Documentation/DocBook/media/v4l/io.xml             |    5 +-
 Documentation/DocBook/media/v4l/pixfmt.xml         | 1274 +++++++++----
 .../DocBook/media/v4l/selections-common.xml        |   16 +
 Documentation/DocBook/media/v4l/subdev-formats.xml |  308 ++--
 .../DocBook/media/v4l/vidioc-enuminput.xml         |    8 +
 .../DocBook/media/v4l/vidioc-enumoutput.xml        |    8 +
 .../devicetree/bindings/media/meson-ir.txt         |   14 +
 Documentation/devicetree/bindings/media/si4713.txt |   30 +
 Documentation/video4linux/CARDLIST.cx23885         |    2 +
 Documentation/video4linux/CARDLIST.em28xx          |    1 +
 Documentation/video4linux/CARDLIST.saa7134         |    1 +
 Documentation/video4linux/soc-camera.txt           |    2 +-
 MAINTAINERS                                        |   41 +
 arch/arm/boot/dts/meson.dtsi                       |    7 +
 arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
 arch/arm/mach-davinci/board-dm365-evm.c            |    4 +-
 arch/arm/mach-davinci/dm355.c                      |    7 +-
 arch/arm/mach-davinci/dm365.c                      |    7 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c       |   71 +-
 arch/arm/mach-omap2/devices.c                      |   31 -
 arch/arm/mach-shmobile/board-mackerel.c            |    2 +-
 arch/sh/boards/mach-ap325rxa/setup.c               |    2 +-
 drivers/gpu/ipu-v3/ipu-csi.c                       |   66 +-
 drivers/media/common/cx2341x.c                     |   29 +
 drivers/media/common/saa7146/saa7146_core.c        |    2 +-
 drivers/media/common/siano/smsir.c                 |    3 +-
 drivers/media/common/tveeprom.c                    |   36 +-
 drivers/media/dvb-core/dvb-usb-ids.h               |    1 +
 drivers/media/dvb-core/dvb_net.c                   |    4 +-
 drivers/media/dvb-frontends/Kconfig                |    5 +-
 drivers/media/dvb-frontends/af9033.c               |  140 +-
 drivers/media/dvb-frontends/af9033_priv.h          |   11 +-
 drivers/media/dvb-frontends/au8522_dig.c           |  117 +-
 drivers/media/dvb-frontends/cx22700.c              |    3 +
 drivers/media/dvb-frontends/cx24110.c              |   50 +-
 drivers/media/dvb-frontends/cx24117.c              |    2 +-
 drivers/media/dvb-frontends/dib7000p.c             |    9 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.c        |    3 +-
 drivers/media/dvb-frontends/drxk_hard.c            |    9 +-
 drivers/media/dvb-frontends/m88ds3103.c            |  267 ++-
 drivers/media/dvb-frontends/m88ds3103_priv.h       |  181 ++
 drivers/media/dvb-frontends/mn88472.h              |   38 +
 drivers/media/dvb-frontends/mn88473.h              |   38 +
 drivers/media/dvb-frontends/rtl2832.c              |   60 +-
 drivers/media/dvb-frontends/rtl2832.h              |   11 +
 drivers/media/dvb-frontends/rtl2832_sdr.c          |    8 +
 drivers/media/dvb-frontends/si2168.c               |   75 +-
 drivers/media/dvb-frontends/si2168.h               |    4 +
 drivers/media/dvb-frontends/si2168_priv.h          |    1 +
 drivers/media/dvb-frontends/sp2.c                  |   21 +-
 drivers/media/dvb-frontends/stb0899_drv.c          |    2 +-
 drivers/media/dvb-frontends/stv090x.c              |  196 +-
 drivers/media/dvb-frontends/stv090x.h              |   44 +-
 drivers/media/firewire/firedtv-ci.c                |    3 +-
 drivers/media/firewire/firedtv.h                   |    2 +-
 drivers/media/i2c/adv7170.c                        |   16 +-
 drivers/media/i2c/adv7175.c                        |   16 +-
 drivers/media/i2c/adv7180.c                        |    6 +-
 drivers/media/i2c/adv7183.c                        |    6 +-
 drivers/media/i2c/adv7511.c                        |  229 ++-
 drivers/media/i2c/adv7604.c                        |  109 +-
 drivers/media/i2c/adv7842.c                        |   40 +-
 drivers/media/i2c/ak881x.c                         |    8 +-
 drivers/media/i2c/cx25840/cx25840-core.c           |   14 +-
 drivers/media/i2c/cx25840/cx25840-firmware.c       |   11 +-
 drivers/media/i2c/ir-kbd-i2c.c                     |    3 +-
 drivers/media/i2c/m5mols/m5mols_core.c             |    6 +-
 drivers/media/i2c/ml86v7667.c                      |    6 +-
 drivers/media/i2c/mt9m032.c                        |    6 +-
 drivers/media/i2c/mt9p031.c                        |    8 +-
 drivers/media/i2c/mt9t001.c                        |    8 +-
 drivers/media/i2c/mt9v011.c                        |    6 +-
 drivers/media/i2c/mt9v032.c                        |   12 +-
 drivers/media/i2c/noon010pc30.c                    |   12 +-
 drivers/media/i2c/ov7670.c                         |   16 +-
 drivers/media/i2c/ov9650.c                         |   10 +-
 drivers/media/i2c/s5c73m3/s5c73m3.h                |    6 +-
 drivers/media/i2c/s5k4ecgx.c                       |    4 +-
 drivers/media/i2c/s5k5baf.c                        |   14 +-
 drivers/media/i2c/s5k6a3.c                         |    2 +-
 drivers/media/i2c/s5k6aa.c                         |    8 +-
 drivers/media/i2c/saa6752hs.c                      |    6 +-
 drivers/media/i2c/saa7115.c                        |    2 +-
 drivers/media/i2c/saa717x.c                        |    2 +-
 drivers/media/i2c/smiapp-pll.c                     |  280 +--
 drivers/media/i2c/smiapp-pll.h                     |   21 +-
 drivers/media/i2c/smiapp/smiapp-core.c             |  259 ++-
 drivers/media/i2c/smiapp/smiapp.h                  |    8 +
 drivers/media/i2c/soc_camera/imx074.c              |    8 +-
 drivers/media/i2c/soc_camera/mt9m001.c             |   14 +-
 drivers/media/i2c/soc_camera/mt9m111.c             |   70 +-
 drivers/media/i2c/soc_camera/mt9t031.c             |   10 +-
 drivers/media/i2c/soc_camera/mt9t112.c             |   22 +-
 drivers/media/i2c/soc_camera/mt9v022.c             |   26 +-
 drivers/media/i2c/soc_camera/ov2640.c              |   54 +-
 drivers/media/i2c/soc_camera/ov5642.c              |    8 +-
 drivers/media/i2c/soc_camera/ov6650.c              |   58 +-
 drivers/media/i2c/soc_camera/ov772x.c              |   20 +-
 drivers/media/i2c/soc_camera/ov9640.c              |   40 +-
 drivers/media/i2c/soc_camera/ov9740.c              |   12 +-
 drivers/media/i2c/soc_camera/rj54n1cb0c.c          |   54 +-
 drivers/media/i2c/soc_camera/tw9910.c              |   10 +-
 drivers/media/i2c/sr030pc30.c                      |   14 +-
 drivers/media/i2c/tvp514x.c                        |   12 +-
 drivers/media/i2c/tvp5150.c                        |    6 +-
 drivers/media/i2c/tvp7002.c                        |   10 +-
 drivers/media/i2c/vs6624.c                         |   18 +-
 drivers/media/media-entity.c                       |   13 +-
 drivers/media/pci/Kconfig                          |    1 +
 drivers/media/pci/Makefile                         |    3 +-
 drivers/media/pci/bt8xx/bttv-cards.c               |    6 +-
 drivers/media/pci/bt8xx/bttv-risc.c                |   12 +-
 drivers/media/pci/cx18/cx18-av-core.c              |   18 +-
 drivers/media/pci/cx18/cx18-cards.h                |    3 +-
 drivers/media/pci/cx18/cx18-controls.c             |    2 +-
 drivers/media/pci/cx18/cx18-driver.h               |    1 +
 drivers/media/pci/cx18/cx18-ioctl.c                |    9 +-
 drivers/media/pci/cx18/cx18-streams.c              |    9 +
 drivers/media/pci/cx23885/cx23885-417.c            |    4 +-
 drivers/media/pci/cx23885/cx23885-cards.c          |  131 ++
 drivers/media/pci/cx23885/cx23885-core.c           |   15 +-
 drivers/media/pci/cx23885/cx23885-dvb.c            |  691 +++++--
 drivers/media/pci/cx23885/cx23885-input.c          |   31 +
 drivers/media/pci/cx23885/cx23885-vbi.c            |   10 +-
 drivers/media/pci/cx23885/cx23885-video.c          |   12 +-
 drivers/media/pci/cx23885/cx23885.h                |    8 +
 drivers/media/pci/cx25821/cx25821-core.c           |   12 +-
 drivers/media/pci/cx88/Kconfig                     |    5 +-
 drivers/media/pci/cx88/Makefile                    |    1 -
 drivers/media/pci/cx88/cx88-alsa.c                 |  112 +-
 drivers/media/pci/cx88/cx88-blackbird.c            |  565 +++---
 drivers/media/pci/cx88/cx88-cards.c                |   71 +-
 drivers/media/pci/cx88/cx88-core.c                 |  119 +-
 drivers/media/pci/cx88/cx88-dvb.c                  |  158 +-
 drivers/media/pci/cx88/cx88-mpeg.c                 |  159 +-
 drivers/media/pci/cx88/cx88-vbi.c                  |  216 ++-
 drivers/media/pci/cx88/cx88-video.c                |  871 +++------
 drivers/media/pci/cx88/cx88.h                      |  104 +-
 drivers/media/pci/ddbridge/ddbridge-core.c         |    3 +-
 drivers/media/pci/ivtv/ivtv-controls.c             |    2 +-
 drivers/media/pci/ivtv/ivtv-ioctl.c                |    2 +-
 drivers/media/pci/ivtv/ivtv-udma.c                 |    2 +-
 drivers/media/pci/meye/meye.c                      |    3 -
 drivers/media/pci/pt1/pt1.c                        |   13 +-
 drivers/media/pci/pt3/pt3.c                        |   75 +-
 drivers/media/pci/saa7134/saa7134-core.c           |   18 +-
 drivers/media/pci/saa7134/saa7134-empress.c        |    5 +-
 drivers/media/pci/saa7134/saa7134-ts.c             |   17 +-
 drivers/media/pci/saa7134/saa7134-vbi.c            |   16 +-
 drivers/media/pci/saa7134/saa7134-video.c          |   16 +-
 drivers/media/pci/saa7134/saa7134.h                |    2 +-
 drivers/media/pci/saa7164/saa7164-buffer.c         |    4 +-
 drivers/media/pci/saa7164/saa7164-bus.c            |  101 +-
 drivers/media/pci/saa7164/saa7164-core.c           |   13 +-
 drivers/media/pci/saa7164/saa7164-fw.c             |    6 +-
 drivers/media/pci/saa7164/saa7164-types.h          |    4 +-
 drivers/media/pci/saa7164/saa7164.h                |    4 +-
 drivers/media/pci/smipcie/Kconfig                  |   17 +
 drivers/media/pci/smipcie/Makefile                 |    6 +
 drivers/media/pci/smipcie/smipcie.c                | 1099 ++++++++++++
 drivers/media/pci/smipcie/smipcie.h                |  299 ++++
 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |   88 +-
 drivers/media/pci/solo6x10/solo6x10.h              |    1 +
 drivers/media/pci/tw68/tw68-core.c                 |   15 +-
 drivers/media/pci/tw68/tw68-video.c                |    9 +-
 drivers/media/pci/tw68/tw68.h                      |    1 +
 drivers/media/pci/zoran/zoran_driver.c             |    5 +-
 drivers/media/platform/Kconfig                     |    4 +-
 drivers/media/platform/Makefile                    |    2 +-
 drivers/media/platform/blackfin/bfin_capture.c     |   34 +-
 drivers/media/platform/coda/Makefile               |    2 +-
 drivers/media/platform/coda/coda-bit.c             |  322 ++--
 drivers/media/platform/coda/coda-common.c          |  607 ++++---
 drivers/media/platform/coda/coda-jpeg.c            |  238 +++
 drivers/media/platform/coda/coda.h                 |   24 +-
 drivers/media/platform/coda/coda_regs.h            |    7 +
 drivers/media/platform/davinci/vpbe.c              |   21 +-
 drivers/media/platform/davinci/vpbe_display.c      |  617 ++-----
 drivers/media/platform/davinci/vpfe_capture.c      |    8 +-
 drivers/media/platform/davinci/vpif_capture.c      |    2 +
 drivers/media/platform/exynos-gsc/gsc-core.c       |   23 +-
 drivers/media/platform/exynos-gsc/gsc-core.h       |    2 +-
 drivers/media/platform/exynos4-is/fimc-capture.c   |    2 +-
 drivers/media/platform/exynos4-is/fimc-core.c      |   14 +-
 drivers/media/platform/exynos4-is/fimc-core.h      |    4 +-
 drivers/media/platform/exynos4-is/fimc-is.c        |   10 +-
 drivers/media/platform/exynos4-is/fimc-isp.c       |   16 +-
 drivers/media/platform/exynos4-is/fimc-lite-reg.c  |   26 +-
 drivers/media/platform/exynos4-is/fimc-lite.c      |   14 +-
 drivers/media/platform/exynos4-is/fimc-reg.c       |   14 +-
 drivers/media/platform/exynos4-is/mipi-csis.c      |   14 +-
 drivers/media/platform/fsl-viu.c                   |    3 +-
 drivers/media/platform/marvell-ccic/mcam-core.c    |   85 +-
 drivers/media/platform/marvell-ccic/mcam-core.h    |    3 +-
 drivers/media/platform/mx2_emmaprp.c               |    9 +-
 drivers/media/platform/omap/Kconfig                |    3 +-
 drivers/media/platform/omap/omap_vout.c            |   11 +-
 drivers/media/platform/omap3isp/ispccdc.c          |  112 +-
 drivers/media/platform/omap3isp/ispccp2.c          |   18 +-
 drivers/media/platform/omap3isp/ispcsi2.c          |   42 +-
 drivers/media/platform/omap3isp/isppreview.c       |   60 +-
 drivers/media/platform/omap3isp/ispresizer.c       |   19 +-
 drivers/media/platform/omap3isp/ispvideo.c         |   95 +-
 drivers/media/platform/omap3isp/ispvideo.h         |   10 +-
 drivers/media/platform/s3c-camif/camif-capture.c   |   10 +-
 drivers/media/platform/s3c-camif/camif-core.c      |    3 +-
 drivers/media/platform/s3c-camif/camif-regs.c      |    8 +-
 drivers/media/platform/s5p-g2d/g2d.c               |   10 +-
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |    9 +-
 drivers/media/platform/s5p-mfc/regs-mfc-v6.h       |    1 +
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |   49 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |    4 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c      |  122 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |   12 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   65 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    |   13 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |   32 +-
 drivers/media/platform/s5p-tv/hdmi_drv.c           |    2 +-
 drivers/media/platform/s5p-tv/sdo_drv.c            |    2 +-
 drivers/media/platform/sh_vou.c                    |   11 +-
 drivers/media/platform/soc_camera/atmel-isi.c      |   22 +-
 drivers/media/platform/soc_camera/mx2_camera.c     |   26 +-
 drivers/media/platform/soc_camera/mx3_camera.c     |    6 +-
 drivers/media/platform/soc_camera/omap1_camera.c   |   36 +-
 drivers/media/platform/soc_camera/pxa_camera.c     |   16 +-
 drivers/media/platform/soc_camera/rcar_vin.c       |   14 +-
 .../platform/soc_camera/sh_mobile_ceu_camera.c     |   20 +-
 drivers/media/platform/soc_camera/sh_mobile_csi2.c |   38 +-
 drivers/media/platform/soc_camera/soc_camera.c     |    2 +-
 .../platform/soc_camera/soc_camera_platform.c      |    2 +-
 drivers/media/platform/soc_camera/soc_mediabus.c   |   78 +-
 drivers/media/platform/ti-vpe/csc.c                |   10 +-
 drivers/media/platform/ti-vpe/sc.c                 |   10 +-
 drivers/media/platform/via-camera.c                |   12 +-
 .../media/platform/{mem2mem_testdev.c => vim2m.c}  |  222 +--
 drivers/media/platform/vino.c                      |    6 +-
 drivers/media/platform/vivid/vivid-core.c          |   21 +-
 drivers/media/platform/vivid/vivid-core.h          |   16 +-
 drivers/media/platform/vivid/vivid-ctrls.c         |  165 +-
 drivers/media/platform/vivid/vivid-sdr-cap.c       |    4 +-
 drivers/media/platform/vivid/vivid-tpg-colors.c    |  704 +++++++-
 drivers/media/platform/vivid/vivid-tpg-colors.h    |    4 +-
 drivers/media/platform/vivid/vivid-tpg.c           |  327 ++--
 drivers/media/platform/vivid/vivid-tpg.h           |   38 +
 drivers/media/platform/vivid/vivid-vbi-cap.c       |    4 +-
 drivers/media/platform/vivid/vivid-vbi-out.c       |    4 +-
 drivers/media/platform/vivid/vivid-vid-cap.c       |   38 +-
 drivers/media/platform/vivid/vivid-vid-common.c    |    4 +
 drivers/media/platform/vivid/vivid-vid-out.c       |   29 +-
 drivers/media/platform/vsp1/vsp1_bru.c             |   14 +-
 drivers/media/platform/vsp1/vsp1_hsit.c            |   12 +-
 drivers/media/platform/vsp1/vsp1_lif.c             |   10 +-
 drivers/media/platform/vsp1/vsp1_lut.c             |   14 +-
 drivers/media/platform/vsp1/vsp1_rwpf.c            |   10 +-
 drivers/media/platform/vsp1/vsp1_sru.c             |   12 +-
 drivers/media/platform/vsp1/vsp1_uds.c             |   10 +-
 drivers/media/platform/vsp1/vsp1_video.c           |   42 +-
 drivers/media/radio/radio-wl1273.c                 |    4 +-
 drivers/media/radio/si4713/radio-platform-si4713.c |   28 +-
 drivers/media/radio/si4713/si4713.c                |  164 +-
 drivers/media/radio/si4713/si4713.h                |   15 +-
 drivers/media/radio/wl128x/fmdrv_v4l2.c            |    4 +-
 drivers/media/rc/Kconfig                           |   26 +
 drivers/media/rc/Makefile                          |    2 +
 drivers/media/rc/igorplugusb.c                     |  261 +++
 drivers/media/rc/img-ir/Kconfig                    |    1 +
 drivers/media/rc/img-ir/img-ir-core.c              |    1 -
 drivers/media/rc/img-ir/img-ir-hw.c                |   28 +-
 drivers/media/rc/img-ir/img-ir-hw.h                |    6 +-
 drivers/media/rc/ir-lirc-codec.c                   |   12 +-
 drivers/media/rc/lirc_dev.c                        |    3 +-
 drivers/media/rc/meson-ir.c                        |  216 +++
 drivers/media/rc/rc-main.c                         |    8 +-
 drivers/media/rc/redrat3.c                         |    4 +-
 drivers/media/tuners/Kconfig                       |    8 +
 drivers/media/tuners/Makefile                      |    1 +
 drivers/media/tuners/m88rs6000t.c                  |  744 ++++++++
 drivers/media/tuners/m88rs6000t.h                  |   29 +
 drivers/media/tuners/m88ts2022.c                   |    2 +
 drivers/media/tuners/mxl5007t.c                    |   30 +-
 drivers/media/tuners/r820t.c                       |   12 +
 drivers/media/tuners/si2157.c                      |   44 +-
 drivers/media/tuners/si2157.h                      |    2 +-
 drivers/media/tuners/si2157_priv.h                 |    8 +-
 drivers/media/tuners/tda18271-common.c             |    2 +-
 drivers/media/tuners/xc5000.c                      |   17 +-
 drivers/media/tuners/xc5000.h                      |    1 +
 drivers/media/usb/au0828/au0828-cards.c            |    5 +
 drivers/media/usb/au0828/au0828-core.c             |    8 +
 drivers/media/usb/au0828/au0828-dvb.c              |    2 +
 drivers/media/usb/au0828/au0828-input.c            |   14 +-
 drivers/media/usb/cx231xx/Kconfig                  |    1 +
 drivers/media/usb/cx231xx/cx231xx-417.c            |   59 +-
 drivers/media/usb/cx231xx/cx231xx-audio.c          |   97 +-
 drivers/media/usb/cx231xx/cx231xx-avcore.c         |  331 ++--
 drivers/media/usb/cx231xx/cx231xx-cards.c          |  257 +--
 drivers/media/usb/cx231xx/cx231xx-core.c           |  165 +-
 drivers/media/usb/cx231xx/cx231xx-dvb.c            |  159 +-
 drivers/media/usb/cx231xx/cx231xx-i2c.c            |  132 +-
 drivers/media/usb/cx231xx/cx231xx-input.c          |    8 +-
 drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c        |   47 +-
 drivers/media/usb/cx231xx/cx231xx-vbi.c            |   48 +-
 drivers/media/usb/cx231xx/cx231xx-video.c          |   89 +-
 drivers/media/usb/cx231xx/cx231xx.h                |   41 +-
 drivers/media/usb/dvb-usb-v2/Kconfig               |    3 +
 drivers/media/usb/dvb-usb-v2/af9035.c              |    1 +
 drivers/media/usb/dvb-usb-v2/dvbsky.c              |  438 ++++-
 drivers/media/usb/dvb-usb-v2/lmedm04.c             |   22 +-
 drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |  231 ++-
 drivers/media/usb/dvb-usb-v2/rtl28xxu.h            |    7 +-
 drivers/media/usb/dvb-usb/Kconfig                  |    1 -
 drivers/media/usb/dvb-usb/af9005.c                 |    3 +
 drivers/media/usb/dvb-usb/cxusb.c                  |  230 +--
 drivers/media/usb/dvb-usb/cxusb.h                  |    4 -
 drivers/media/usb/dvb-usb/technisat-usb2.c         |    5 +-
 drivers/media/usb/em28xx/em28xx-audio.c            |   19 +-
 drivers/media/usb/em28xx/em28xx-camera.c           |    7 +-
 drivers/media/usb/em28xx/em28xx-cards.c            |   71 +-
 drivers/media/usb/em28xx/em28xx-core.c             |   41 +-
 drivers/media/usb/em28xx/em28xx-dvb.c              |   95 +-
 drivers/media/usb/em28xx/em28xx-i2c.c              |    6 +-
 drivers/media/usb/em28xx/em28xx-input.c            |   17 +-
 drivers/media/usb/em28xx/em28xx-reg.h              |    3 -
 drivers/media/usb/em28xx/em28xx-v4l.h              |    1 -
 drivers/media/usb/em28xx/em28xx-vbi.c              |    1 -
 drivers/media/usb/em28xx/em28xx-video.c            |   98 +-
 drivers/media/usb/em28xx/em28xx.h                  |   27 +-
 drivers/media/usb/go7007/go7007-v4l2.c             |    2 +-
 drivers/media/usb/pvrusb2/pvrusb2-context.c        |    2 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |    2 +-
 drivers/media/usb/s2255/s2255drv.c                 |   25 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |    2 +-
 drivers/media/usb/usbvision/usbvision-video.c      |    3 +-
 drivers/media/usb/uvc/uvc_driver.c                 |   51 +-
 drivers/media/usb/uvc/uvc_queue.c                  |  161 +-
 drivers/media/usb/uvc/uvc_v4l2.c                   | 1009 ++++++-----
 drivers/media/usb/uvc/uvc_video.c                  |   23 +-
 drivers/media/usb/uvc/uvcvideo.h                   |   12 +-
 drivers/media/v4l2-core/v4l2-common.c              |  125 --
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |   10 +-
 drivers/media/v4l2-core/v4l2-ctrls.c               |   87 +-
 drivers/media/v4l2-core/v4l2-dev.c                 |   34 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |   15 +-
 drivers/media/v4l2-core/videobuf-core.c            |    6 +-
 drivers/media/v4l2-core/videobuf2-core.c           |   49 +-
 drivers/media/v4l2-core/videobuf2-dma-contig.c     |   71 +-
 drivers/media/v4l2-core/videobuf2-dma-sg.c         |  425 ++++-
 drivers/media/v4l2-core/videobuf2-vmalloc.c        |  194 +-
 drivers/staging/media/Kconfig                      |    4 +-
 drivers/staging/media/Makefile                     |    4 +-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |    7 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |   18 +-
 .../staging/media/davinci_vpfe/dm365_ipipe_hw.c    |   26 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c |  100 +-
 drivers/staging/media/davinci_vpfe/dm365_isif.c    |   90 +-
 drivers/staging/media/davinci_vpfe/dm365_resizer.c |   98 +-
 .../staging/media/davinci_vpfe/vpfe_mc_capture.c   |   18 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.c    |    8 +-
 drivers/staging/media/dt3155v4l/dt3155v4l.c        |    5 +-
 drivers/staging/media/lirc/Kconfig                 |    6 -
 drivers/staging/media/lirc/Makefile                |    1 -
 drivers/staging/media/lirc/lirc_igorplugusb.c      |  508 ------
 drivers/staging/media/lirc/lirc_imon.c             |   10 +-
 drivers/staging/media/lirc/lirc_sasem.c            |   10 +-
 drivers/staging/media/lirc/lirc_zilog.c            |    8 +-
 drivers/staging/media/mn88472/Kconfig              |    7 +
 drivers/staging/media/mn88472/Makefile             |    5 +
 drivers/staging/media/mn88472/TODO                 |   21 +
 drivers/staging/media/mn88472/mn88472.c            |  523 ++++++
 drivers/staging/media/mn88472/mn88472_priv.h       |   36 +
 drivers/staging/media/mn88473/Kconfig              |    7 +
 drivers/staging/media/mn88473/Makefile             |    5 +
 drivers/staging/media/mn88473/TODO                 |   21 +
 drivers/staging/media/mn88473/mn88473.c            |  464 +++++
 drivers/staging/media/mn88473/mn88473_priv.h       |   36 +
 drivers/staging/media/omap24xx/Kconfig             |   35 -
 drivers/staging/media/omap24xx/Makefile            |    5 -
 drivers/staging/media/omap24xx/omap24xxcam-dma.c   |  598 -------
 drivers/staging/media/omap24xx/omap24xxcam.c       | 1882 --------------------
 drivers/staging/media/omap24xx/omap24xxcam.h       |  596 -------
 drivers/staging/media/omap24xx/tcm825x.c           |  938 ----------
 drivers/staging/media/omap24xx/tcm825x.h           |  200 ---
 drivers/staging/media/omap24xx/v4l2-int-device.c   |  164 --
 drivers/staging/media/omap24xx/v4l2-int-device.h   |  305 ----
 drivers/staging/media/omap4iss/iss_csi2.c          |   62 +-
 drivers/staging/media/omap4iss/iss_ipipe.c         |   16 +-
 drivers/staging/media/omap4iss/iss_ipipeif.c       |   28 +-
 drivers/staging/media/omap4iss/iss_resizer.c       |   26 +-
 drivers/staging/media/omap4iss/iss_video.c         |   78 +-
 drivers/staging/media/omap4iss/iss_video.h         |   10 +-
 include/media/davinci/vpbe.h                       |    2 +-
 include/media/davinci/vpbe_display.h               |   21 -
 include/media/davinci/vpbe_venc.h                  |    5 +-
 include/media/exynos-fimc.h                        |    2 +-
 include/media/lirc_dev.h                           |    8 +-
 include/media/radio-si4713.h                       |   30 -
 include/media/si4713.h                             |    4 +-
 include/media/soc_camera.h                         |    2 +-
 include/media/soc_mediabus.h                       |    6 +-
 include/media/v4l2-common.h                        |   17 +-
 include/media/v4l2-ctrls.h                         |   25 +
 include/media/v4l2-image-sizes.h                   |    9 +
 include/media/v4l2-mediabus.h                      |    6 +-
 include/media/v4l2-subdev.h                        |    2 +-
 include/media/videobuf2-core.h                     |   42 +-
 include/media/videobuf2-dma-sg.h                   |    3 +
 include/uapi/linux/Kbuild                          |    1 +
 include/uapi/linux/media-bus-format.h              |  125 ++
 include/uapi/linux/v4l2-common.h                   |    2 +
 include/uapi/linux/v4l2-mediabus.h                 |  219 ++-
 include/uapi/linux/v4l2-subdev.h                   |    6 +-
 include/uapi/linux/videodev2.h                     |  101 +-
 sound/usb/quirks-table.h                           |  166 +-
 416 files changed, 16517 insertions(+), 13239 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/meson-ir.txt
 create mode 100644 Documentation/devicetree/bindings/media/si4713.txt
 create mode 100644 drivers/media/dvb-frontends/mn88472.h
 create mode 100644 drivers/media/dvb-frontends/mn88473.h
 create mode 100644 drivers/media/pci/smipcie/Kconfig
 create mode 100644 drivers/media/pci/smipcie/Makefile
 create mode 100644 drivers/media/pci/smipcie/smipcie.c
 create mode 100644 drivers/media/pci/smipcie/smipcie.h
 create mode 100644 drivers/media/platform/coda/coda-jpeg.c
 rename drivers/media/platform/{mem2mem_testdev.c => vim2m.c} (81%)
 create mode 100644 drivers/media/rc/igorplugusb.c
 create mode 100644 drivers/media/rc/meson-ir.c
 create mode 100644 drivers/media/tuners/m88rs6000t.c
 create mode 100644 drivers/media/tuners/m88rs6000t.h
 delete mode 100644 drivers/staging/media/lirc/lirc_igorplugusb.c
 create mode 100644 drivers/staging/media/mn88472/Kconfig
 create mode 100644 drivers/staging/media/mn88472/Makefile
 create mode 100644 drivers/staging/media/mn88472/TODO
 create mode 100644 drivers/staging/media/mn88472/mn88472.c
 create mode 100644 drivers/staging/media/mn88472/mn88472_priv.h
 create mode 100644 drivers/staging/media/mn88473/Kconfig
 create mode 100644 drivers/staging/media/mn88473/Makefile
 create mode 100644 drivers/staging/media/mn88473/TODO
 create mode 100644 drivers/staging/media/mn88473/mn88473.c
 create mode 100644 drivers/staging/media/mn88473/mn88473_priv.h
 delete mode 100644 drivers/staging/media/omap24xx/Kconfig
 delete mode 100644 drivers/staging/media/omap24xx/Makefile
 delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam-dma.c
 delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam.c
 delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam.h
 delete mode 100644 drivers/staging/media/omap24xx/tcm825x.c
 delete mode 100644 drivers/staging/media/omap24xx/tcm825x.h
 delete mode 100644 drivers/staging/media/omap24xx/v4l2-int-device.c
 delete mode 100644 drivers/staging/media/omap24xx/v4l2-int-device.h
 delete mode 100644 include/media/radio-si4713.h
 create mode 100644 include/uapi/linux/media-bus-format.h