Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (59 commits)
  V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum
  V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER
  V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access
  V4L/DVB (7200): Fix FM firmware loading
  V4L/DVB (7198): V4L, include ioctl.h in videodev headers
  V4L/DVB (7197): bttv: Fix overlay divide error
  V4L/DVB (7195): xc5000: fix build error when built as module
  V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices
  V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133
  V4L/DVB (7192): Adds support for Genius TVGo A11MCE
  V4L/DVB (7189): autosuspend support
  V4L/DVB (7188): radio-si470x version 1.0.6
  V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option
  V4L/DVB (7183): radio-si470x: fix build warning
  V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set
  V4L/DVB (7179): Allow more than one em28xx board
  V4L/DVB (7164): em28xx-alsa: Add a missing mutex
  V4L/DVB (7163): em28xx: makes audio settings more stable
  V4L/DVB (7162): em28xx: Fix endian and returns the correct values
  V4L/DVB (7161): em28xx: Fix printing debug values higher than 127
  ...

1 files changed, 46 insertions, 0 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index a4a937c90534..2ab5a120470d 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1987,3 +1987,49 @@ IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_behold);
+
+/*
+ * Remote control for the Genius TVGO A11MCE
+ * Adrian Pardini <pardo.bsso@gmail.com>
+ */
+IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE] = {
+        /* Keys 0 to 9 */
+        [0x48] = KEY_0,
+        [0x09] = KEY_1,
+        [0x1d] = KEY_2,
+        [0x1f] = KEY_3,
+        [0x19] = KEY_4,
+        [0x1b] = KEY_5,
+        [0x11] = KEY_6,
+        [0x17] = KEY_7,
+        [0x12] = KEY_8,
+        [0x16] = KEY_9,
+
+        [0x54] = KEY_RECORD,            /* recording */
+        [0x06] = KEY_MUTE,              /* mute */
+        [0x10] = KEY_POWER,
+        [0x40] = KEY_LAST,              /* recall */
+        [0x4c] = KEY_CHANNELUP,         /* channel / program + */
+        [0x00] = KEY_CHANNELDOWN,       /* channel / program - */
+        [0x0d] = KEY_VOLUMEUP,
+        [0x15] = KEY_VOLUMEDOWN,
+        [0x4d] = KEY_OK,                /* also labeled as Pause */
+        [0x1c] = KEY_ZOOM,              /* full screen and Stop*/
+        [0x02] = KEY_MODE,              /* AV Source or Rewind*/
+        [0x04] = KEY_LIST,              /* -/-- */
+        /* small arrows above numbers */
+        [0x1a] = KEY_NEXT,              /* also Fast Forward */
+        [0x0e] = KEY_PREVIOUS,  /* also Rewind */
+        /* these are in a rather non standard layout and have
+        an alternate name written */
+        [0x1e] = KEY_UP,                /* Video Setting */
+        [0x0a] = KEY_DOWN,              /* Video Default */
+        [0x05] = KEY_LEFT,              /* Snapshot */
+        [0x0c] = KEY_RIGHT,             /* Hide Panel */
+        /* Four buttons without label */
+        [0x49] = KEY_RED,
+        [0x0b] = KEY_GREEN,
+        [0x13] = KEY_YELLOW,
+        [0x50] = KEY_BLUE,
+};
+EXPORT_SYMBOL_GPL(ir_codes_genius_tvgo_a11mce);