Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-17 00:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9e534f8478
linux/drivers/media/pci/cx23885
History
Linus Torvalds 3c83e61e67 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 
Pull media updates from Mauro Carvalho Chehab:
 "The main set of series of patches for media subsystem, including:
   - document RC sysfs class
   - added an API to setup scancode to allow waking up systems using the
     Remote Controller
   - add API for SDR devices.  Drivers are still on staging
   - some API improvements for getting EDID data from media
     inputs/outputs
   - new DVB frontend driver for drx-j (ATSC)
   - one driver (it913x/it9137) got removed, in favor of an improvement
     on another driver (af9035)
   - added a skeleton V4L2 PCI driver at documentation
   - added a dual flash driver (lm3646)
   - added a new IR driver (img-ir)
   - added an IR scancode decoder for the Sharp protocol
   - some improvements at the usbtv driver, to allow its core to be
     reused.
   - added a new SDR driver (rtl2832u_sdr)
   - added a new tuner driver (msi001)
   - several improvements at em28xx driver to fix PM support, device
     removal and to split the V4L2 specific bits into a separate
     sub-driver
   - one driver got converted to videobuf2 (s2255drv)
   - the e4000 tuner driver now follows an improved binding model
   - some fixes at V4L2 compat32 code
   - several fixes and enhancements at videobuf2 code
   - some cleanups at V4L2 API documentation
   - usual driver enhancements, new board additions and misc fixups"

[ NOTE! This merge effective drops commit 4329b93b28 ("of: Reduce
  indentation in of_graph_get_next_endpoint").

  The of_graph_get_next_endpoint() function was moved and renamed by
  commit fd9fdb78a9 ("[media] of: move graph helpers from
  drivers/media/v4l2-core to drivers/of").  It was originally called
  v4l2_of_get_next_endpoint() and lived in the file
  drivers/media/v4l2-core/v4l2-of.c.

  In that original location, it was then fixed to support empty port
  nodes by commit b9db140c1e ("[media] v4l: of: Support empty port
  nodes"), and that commit clashes badly with the dropped "Reduce
  intendation" commit.  I had to choose one or the other, and decided
  that the "Support empty port nodes" commit was more important ]

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits)
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
  [media] em28xx: fix PCTV 290e LNA oops
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  [media] m88ds3103: fix bug on .set_tone()
  [media] saa7134: fix WARN_ON during resume
  [media] v4l2-dv-timings: add module name, description, license
  [media] videodev2.h: add parenthesis around macro arguments
  [media] saa6752hs: depends on CRC32
  [media] si4713: fix Kconfig dependencies
  [media] Sensoray 2255 uses videobuf2
  [media] adv7180: free an interrupt on failure paths in init_device()
  [media] e4000: make VIDEO_V4L2 dependency optional
  [media] af9033: Don't export functions for the hardware filter
  [media] af9035: use af9033 PID filters
  [media] af9033: implement PID filter
  [media] rtl2832_sdr: do not use dynamic stack allocation
  [media] e4000: fix 32-bit build error
  [media] em28xx-audio: make sure audio is unmuted on open()
  [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
  ...
2014-04-04 09:50:07 -07:00
..
altera-ci.c [media] cx23885: get rid of warning: no previous prototype 2012-10-27 17:58:25 -02:00
altera-ci.h [media] cx23885: use IS_ENABLED 2013-03-23 09:29:10 -03:00
cimax2.c [media] cimax2: Don't use dynamic static allocation 2013-11-08 09:45:42 -02:00
cimax2.h
cx23885-417.c [media] media_tree: Fix spelling errors 2013-12-09 14:50:50 -02:00
cx23885-alsa.c [media] Convert to snd_card_new() with a device pointer 2014-02-14 08:14:09 +01:00
cx23885-av.c [media] cx23885[v4]: Fix interrupt storm when enabling IR receiver 2013-08-01 14:55:24 -03:00
cx23885-av.h
cx23885-cards.c [media] cx23885: Add Leadtek Winfast PxPVR2200 2013-10-14 07:19:59 -03:00
cx23885-core.c [media] misc drivers: remove deprecated IRQF_DISABLED 2013-10-17 06:08:31 -03:00
cx23885-dvb.c [media] cx23885: Fix tuning regression for TeVii S471 2014-02-04 17:45:37 -02:00
cx23885-f300.c [media] cx23885: get rid of warning: no previous prototype 2012-10-27 17:58:25 -02:00
cx23885-f300.h
cx23885-i2c.c
cx23885-input.c [media] rc: abstract access to allowed/enabled protocols 2014-03-11 13:24:39 -03:00
cx23885-input.h [media] cx23885: get rid of warning: no previous prototype 2012-10-27 17:58:25 -02:00
cx23885-ioctl.c [media] cx23885: remove g_chip_ident 2013-06-17 08:43:46 -03:00
cx23885-ioctl.h [media] cx23885: remove g_chip_ident 2013-06-17 08:43:46 -03:00
cx23885-ir.c [media] cx23885: get rid of warning: no previous prototype 2012-10-27 17:58:25 -02:00
cx23885-ir.h
cx23885-reg.h
cx23885-vbi.c
cx23885-video.c [media] cx23885: Add Leadtek Winfast PxPVR2200 2013-10-14 07:19:59 -03:00
cx23885-video.h [media] cx23885[v4]: Fix interrupt storm when enabling IR receiver 2013-08-01 14:55:24 -03:00
cx23885.h [media] cx23885: Add Leadtek Winfast PxPVR2200 2013-10-14 07:19:59 -03:00
cx23888-ir.c [media] cx23885: remove g_chip_ident 2013-06-17 08:43:46 -03:00
cx23888-ir.h
Kconfig [media] cx23885: add support for cx24117 with tbs6980 or tbs6981 2013-10-03 07:39:22 -03:00
Makefile [media] btcx-risc: move from media/i2c to media/common 2013-02-08 16:11:25 -02:00
netup-eeprom.c
netup-eeprom.h
netup-init.c [media] cx23885: get rid of warning: no previous prototype 2012-10-27 17:58:25 -02:00
netup-init.h