Skip to contentSkip to conversation

IR additions and misc media fixes for 2.6.40

GIT PULL Jarod Wilson 1 participant 1 message Apr 19, 2011 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

IR additions and misc minor media_tree fixes for 2.6.40. There's an input.h patch included in here, which was merged in 2.6.39-rc4, that the patch just after it depends upon, wasn't quite sure how to handle that, since it wasn't already in the staging/for_v2.6.40 branch that this is on top of...

The main IR additions are the improved support for more variants of the Nuvoton Super I/O LPC integrated CIR function in nuvoton-cir and the addition of a TiVo keymap which is now used by default with the mceusb driven TiVo branded transceiver that ships in the Nero LiquidTV bundle.

The following changes since commit f2dae48f7f0888fdfb978677ab0d03af468c2218:

[media] gspca - kinect: New subdriver for Microsoft Kinect (2011-04-19 17:24:56 -0300)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jarod/linux-2.6-ir.git linuxtv-dev

Jarod Wilson (10):
rc: add tivo/nero liquidtv keymap
mceusb: tivo transceiver should default to tivo keymap
Input: add KEY_IMAGES specifically for AL Image Browser [media] rc: further key name standardization [media] rc/nuvoton-cir: only warn about unknown chips [media] rc/nuvoton-cir: enable CIR on w83667hg chip variant [media] mceusb: Formosa e017 device has no tx
ttusb-budget: driver has a debug param, use it
lirc_sasem: key debug spew off debug modparam
tm6000: fix vbuf may be used uninitialized

 drivers/media/dvb/dvb-usb/dibusb-common.c          |    2 +-
 drivers/media/dvb/dvb-usb/m920x.c                  |   16 ++--
 drivers/media/dvb/dvb-usb/nova-t-usb2.c            |    2 +-
 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c  |   60 ++++++-------
 drivers/media/rc/keymaps/Makefile                  |    1 +
 drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    2 +-
 drivers/media/rc/keymaps/rc-imon-mce.c             |    2 +-
 drivers/media/rc/keymaps/rc-imon-pad.c             |    6 +-
 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    2 +-
 drivers/media/rc/keymaps/rc-rc6-mce.c              |    4 +-
 drivers/media/rc/keymaps/rc-tivo.c                 |   98 ++++++++++++++++++++
 drivers/media/rc/mceusb.c                          |   16 +++-
 drivers/media/rc/nuvoton-cir.c                     |   62 ++++++++++---
 drivers/media/rc/nuvoton-cir.h                     |   17 +++-
 drivers/staging/lirc/lirc_sasem.c                  |   13 ++-
 drivers/staging/tm6000/tm6000-video.c              |    4 +-
 include/linux/input.h                              |    9 +-
 include/media/rc-map.h                             |    1 +
 18 files changed, 235 insertions(+), 82 deletions(-)
 create mode 100644 drivers/media/rc/keymaps/rc-tivo.c
Signature · 2 lines
Jarod Wilson
[email protected]