Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

8 files changed, 301 insertions, 135 deletions

diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index 195c6cf359f6..d22a8ec523fc 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -13,6 +13,7 @@ source "drivers/media/IR/keymaps/Kconfig"
 config IR_NEC_DECODER
         tristate "Enable IR raw decoder for the NEC protocol"
         depends on IR_CORE
+        select BITREVERSE
         default y
 
         ---help---
@@ -22,6 +23,7 @@ config IR_NEC_DECODER
 config IR_RC5_DECODER
         tristate "Enable IR raw decoder for the RC-5 protocol"
         depends on IR_CORE
+        select BITREVERSE
         default y
 
         ---help---
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index 5e2045670004..4bbd45f4284c 100644
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -94,6 +94,7 @@ struct imon_context {
 
         bool display_supported;         /* not all controllers do */
         bool display_isopen;            /* display port has been opened */
+        bool rf_device;                 /* true if iMON 2.4G LT/DT RF device */
         bool rf_isassociating;          /* RF remote associating */
         bool dev_present_intf0;         /* USB device presence, interface 0 */
         bool dev_present_intf1;         /* USB device presence, interface 1 */
@@ -385,7 +386,7 @@ static int display_open(struct inode *inode, struct file *file)
                 err("%s: display port is already open", __func__);
                 retval = -EBUSY;
         } else {
-                ictx->display_isopen = 1;
+                ictx->display_isopen = true;
                 file->private_data = ictx;
                 dev_dbg(ictx->dev, "display port opened\n");
         }
@@ -422,7 +423,7 @@ static int display_close(struct inode *inode, struct file *file)
                 err("%s: display is not open", __func__);
                 retval = -EIO;
         } else {
-                ictx->display_isopen = 0;
+                ictx->display_isopen = false;
                 dev_dbg(ictx->dev, "display port closed\n");
                 if (!ictx->dev_present_intf0) {
                         /*
@@ -491,12 +492,12 @@ static int send_packet(struct imon_context *ictx)
         }
 
         init_completion(&ictx->tx.finished);
-        ictx->tx.busy = 1;
+        ictx->tx.busy = true;
         smp_rmb(); /* ensure later readers know we're busy */
 
         retval = usb_submit_urb(ictx->tx_urb, GFP_KERNEL);
         if (retval) {
-                ictx->tx.busy = 0;
+                ictx->tx.busy = false;
                 smp_rmb(); /* ensure later readers know we're not busy */
                 err("%s: error submitting urb(%d)", __func__, retval);
         } else {
@@ -682,7 +683,7 @@ static ssize_t store_associate_remote(struct device *d,
                 return -ENODEV;
 
         mutex_lock(&ictx->lock);
-        ictx->rf_isassociating = 1;
+        ictx->rf_isassociating = true;
         send_associate_24g(ictx);
         mutex_unlock(&ictx->lock);
 
@@ -950,7 +951,7 @@ static void usb_tx_callback(struct urb *urb)
         ictx->tx.status = urb->status;
 
         /* notify waiters that write has finished */
-        ictx->tx.busy = 0;
+        ictx->tx.busy = false;
         smp_rmb(); /* ensure later readers know we're not busy */
         complete(&ictx->tx.finished);
 }
@@ -1215,7 +1216,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
 {
         char rel_x = 0x00, rel_y = 0x00;
         u8 right_shift = 1;
-        bool mouse_input = 1;
+        bool mouse_input = true;
         int dir = 0;
 
         /* newer iMON device PAD or mouse button */
@@ -1246,7 +1247,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
         } else if (ictx->kc == KEY_CHANNELDOWN && (buf[2] & 0x40) != 0x40) {
                 dir = -1;
         } else
-                mouse_input = 0;
+                mouse_input = false;
 
         if (mouse_input) {
                 dev_dbg(ictx->dev, "sending mouse data via input subsystem\n");
@@ -1450,7 +1451,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
         unsigned char *buf = urb->transfer_buffer;
         struct device *dev = ictx->dev;
         u32 kc;
-        bool norelease = 0;
+        bool norelease = false;
         int i;
         u64 temp_key;
         u64 panel_key = 0;
@@ -1465,7 +1466,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
         idev = ictx->idev;
 
         /* filter out junk data on the older 0xffdc imon devices */
-        if ((buf[0] == 0xff) && (buf[7] == 0xff))
+        if ((buf[0] == 0xff) && (buf[1] == 0xff) && (buf[2] == 0xff))
                 return;
 
         /* Figure out what key was pressed */
@@ -1517,7 +1518,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
              !(buf[1] & 0x1 || buf[1] >> 2 & 0x1))) {
                 len = 8;
                 imon_pad_to_keys(ictx, buf);
-                norelease = 1;
+                norelease = true;
         }
 
         if (debug) {
@@ -1580,7 +1581,7 @@ not_input_data:
             (buf[6] == 0x5E && buf[7] == 0xDF))) {      /* DT */
                 dev_warn(dev, "%s: remote associated refid=%02X\n",
                          __func__, buf[1]);
-                ictx->rf_isassociating = 0;
+                ictx->rf_isassociating = false;
         }
 }
 
@@ -1790,9 +1791,9 @@ static bool imon_find_endpoints(struct imon_context *ictx,
         int ifnum = iface_desc->desc.bInterfaceNumber;
         int num_endpts = iface_desc->desc.bNumEndpoints;
         int i, ep_dir, ep_type;
-        bool ir_ep_found = 0;
-        bool display_ep_found = 0;
-        bool tx_control = 0;
+        bool ir_ep_found = false;
+        bool display_ep_found = false;
+        bool tx_control = false;
 
         /*
          * Scan the endpoint list and set:
@@ -1808,13 +1809,13 @@ static bool imon_find_endpoints(struct imon_context *ictx,
                     ep_type == USB_ENDPOINT_XFER_INT) {
 
                         rx_endpoint = ep;
-                        ir_ep_found = 1;
+                        ir_ep_found = true;
                         dev_dbg(ictx->dev, "%s: found IR endpoint\n", __func__);
 
                 } else if (!display_ep_found && ep_dir == USB_DIR_OUT &&
                            ep_type == USB_ENDPOINT_XFER_INT) {
                         tx_endpoint = ep;
-                        display_ep_found = 1;
+                        display_ep_found = true;
                         dev_dbg(ictx->dev, "%s: found display endpoint\n", __func__);
                 }
         }
@@ -1835,8 +1836,8 @@ static bool imon_find_endpoints(struct imon_context *ictx,
          * newer iMON devices that use control urb instead of interrupt
          */
         if (!display_ep_found) {
-                tx_control = 1;
-                display_ep_found = 1;
+                tx_control = true;
+                display_ep_found = true;
                 dev_dbg(ictx->dev, "%s: device uses control endpoint, not "
                         "interface OUT endpoint\n", __func__);
         }
@@ -1847,7 +1848,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
          * and without... :\
          */
         if (ictx->display_type == IMON_DISPLAY_TYPE_NONE) {
-                display_ep_found = 0;
+                display_ep_found = false;
                 dev_dbg(ictx->dev, "%s: device has no display\n", __func__);
         }
 
@@ -1856,7 +1857,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
          * that refers to e.g. /dev/lcd0 (a character device LCD or VFD).
          */
         if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
-                display_ep_found = 0;
+                display_ep_found = false;
                 dev_dbg(ictx->dev, "%s: iMON Touch device found\n", __func__);
         }
 
@@ -1905,9 +1906,10 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
 
         ictx->dev = dev;
         ictx->usbdev_intf0 = usb_get_dev(interface_to_usbdev(intf));
-        ictx->dev_present_intf0 = 1;
+        ictx->dev_present_intf0 = true;
         ictx->rx_urb_intf0 = rx_urb;
         ictx->tx_urb = tx_urb;
+        ictx->rf_device = false;
 
         ictx->vendor  = le16_to_cpu(ictx->usbdev_intf0->descriptor.idVendor);
         ictx->product = le16_to_cpu(ictx->usbdev_intf0->descriptor.idProduct);
@@ -1979,7 +1981,7 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
         }
 
         ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf));
-        ictx->dev_present_intf1 = 1;
+        ictx->dev_present_intf1 = true;
         ictx->rx_urb_intf1 = rx_urb;
 
         ret = -ENODEV;
@@ -2047,6 +2049,12 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                 dev_info(ictx->dev, "0xffdc iMON Knob, iMON IR");
                 ictx->display_supported = false;
                 break;
+        /* iMON 2.4G LT (usb stick), no display, iMON RF */
+        case 0x4e:
+                dev_info(ictx->dev, "0xffdc iMON 2.4G LT, iMON RF");
+                ictx->display_supported = false;
+                ictx->rf_device = true;
+                break;
         /* iMON VFD, no IR (does have vol knob tho) */
         case 0x35:
                 dev_info(ictx->dev, "0xffdc iMON VFD + knob, no IR");
@@ -2197,15 +2205,6 @@ static int __devinit imon_probe(struct usb_interface *interface,
                         goto fail;
                 }
 
-                if (product == 0xffdc) {
-                        /* RF products *also* use 0xffdc... sigh... */
-                        sysfs_err = sysfs_create_group(&interface->dev.kobj,
-                                                       &imon_rf_attribute_group);
-                        if (sysfs_err)
-                                err("%s: Could not create RF sysfs entries(%d)",
-                                    __func__, sysfs_err);
-                }
-
         } else {
         /* this is the secondary interface on the device */
                 ictx = imon_init_intf1(interface, first_if_ctx);
@@ -2233,6 +2232,14 @@ static int __devinit imon_probe(struct usb_interface *interface,
 
                 imon_set_display_type(ictx, interface);
 
+                if (product == 0xffdc && ictx->rf_device) {
+                        sysfs_err = sysfs_create_group(&interface->dev.kobj,
+                                                       &imon_rf_attribute_group);
+                        if (sysfs_err)
+                                err("%s: Could not create RF sysfs entries(%d)",
+                                    __func__, sysfs_err);
+                }
+
                 if (ictx->display_supported)
                         imon_init_display(ictx, interface);
         }
@@ -2297,7 +2304,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
         }
 
         if (ifnum == 0) {
-                ictx->dev_present_intf0 = 0;
+                ictx->dev_present_intf0 = false;
                 usb_kill_urb(ictx->rx_urb_intf0);
                 input_unregister_device(ictx->idev);
                 if (ictx->display_supported) {
@@ -2307,7 +2314,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
                                 usb_deregister_dev(interface, &imon_vfd_class);
                 }
         } else {
-                ictx->dev_present_intf1 = 0;
+                ictx->dev_present_intf1 = false;
                 usb_kill_urb(ictx->rx_urb_intf1);
                 if (ictx->display_type == IMON_DISPLAY_TYPE_VGA)
                         input_unregister_device(ictx->touch);
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 9374a006f43d..94a8577e72eb 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -490,11 +490,12 @@ int __ir_input_register(struct input_dev *input_dev,
         if (rc < 0)
                 goto out_table;
 
-        if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
-                rc = ir_raw_event_register(input_dev);
-                if (rc < 0)
-                        goto out_event;
-        }
+        if (ir_dev->props)
+                if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
+                        rc = ir_raw_event_register(input_dev);
+                        if (rc < 0)
+                                goto out_event;
+                }
 
         IR_dprintk(1, "Registered input device on %s for %s remote.\n",
                    driver_name, rc_tab->name);
@@ -530,8 +531,10 @@ void ir_input_unregister(struct input_dev *input_dev)
         IR_dprintk(1, "Freed keycode table\n");
 
         del_timer_sync(&ir_dev->timer_keyup);
-        if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
-                ir_raw_event_unregister(input_dev);
+        if (ir_dev->props)
+                if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
+                        ir_raw_event_unregister(input_dev);
+
         rc_tab = &ir_dev->rc_tab;
         rc_tab->size = 0;
         kfree(rc_tab->scan);
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index d7da63e16c92..2098dd1488e0 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev)
         if (unlikely(devno < 0))
                 return devno;
 
-        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-                ir_dev->dev.type = &rc_dev_type;
-        else
+        if (ir_dev->props) {
+                if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
+                        ir_dev->dev.type = &rc_dev_type;
+        } else
                 ir_dev->dev.type = &ir_raw_dev_type;
 
         ir_dev->dev.class = &ir_input_class;
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index ec25258a955f..aea649fbcf5a 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -6,7 +6,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                         rc-avermedia.o \
                         rc-avermedia-cardbus.o \
                         rc-avermedia-dvbt.o \
-                        rc-avermedia-m135a-rm-jx.o \
+                        rc-avermedia-m135a.o \
+                        rc-avermedia-m733a-rm-k6.o \
                         rc-avertv-303.o \
                         rc-behold.o \
                         rc-behold-columbus.o \
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c b/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
deleted file mode 100644
index 101e7ea85941..000000000000
--- a/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* avermedia-m135a-rm-jx.h - Keytable for avermedia_m135a_rm_jx Remote Controller
- *
- * keymap imported from ir-keymaps.c
- *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <media/rc-map.h>
-
-/*
- * Avermedia M135A with IR model RM-JX
- * The same codes exist on both Positivo (BR) and original IR
- * Mauro Carvalho Chehab <mchehab@infradead.org>
- */
-
-static struct ir_scancode avermedia_m135a_rm_jx[] = {
-        { 0x0200, KEY_POWER2 },
-        { 0x022e, KEY_DOT },            /* '.' */
-        { 0x0201, KEY_MODE },           /* TV/FM or SOURCE */
-
-        { 0x0205, KEY_1 },
-        { 0x0206, KEY_2 },
-        { 0x0207, KEY_3 },
-        { 0x0209, KEY_4 },
-        { 0x020a, KEY_5 },
-        { 0x020b, KEY_6 },
-        { 0x020d, KEY_7 },
-        { 0x020e, KEY_8 },
-        { 0x020f, KEY_9 },
-        { 0x0211, KEY_0 },
-
-        { 0x0213, KEY_RIGHT },          /* -> or L */
-        { 0x0212, KEY_LEFT },           /* <- or R */
-
-        { 0x0217, KEY_SLEEP },          /* Capturar Imagem or Snapshot */
-        { 0x0210, KEY_SHUFFLE },        /* Amostra or 16 chan prev */
-
-        { 0x0303, KEY_CHANNELUP },
-        { 0x0302, KEY_CHANNELDOWN },
-        { 0x021f, KEY_VOLUMEUP },
-        { 0x021e, KEY_VOLUMEDOWN },
-        { 0x020c, KEY_ENTER },          /* Full Screen */
-
-        { 0x0214, KEY_MUTE },
-        { 0x0208, KEY_AUDIO },
-
-        { 0x0203, KEY_TEXT },           /* Teletext */
-        { 0x0204, KEY_EPG },
-        { 0x022b, KEY_TV2 },            /* TV2 or PIP */
-
-        { 0x021d, KEY_RED },
-        { 0x021c, KEY_YELLOW },
-        { 0x0301, KEY_GREEN },
-        { 0x0300, KEY_BLUE },
-
-        { 0x021a, KEY_PLAYPAUSE },
-        { 0x0219, KEY_RECORD },
-        { 0x0218, KEY_PLAY },
-        { 0x021b, KEY_STOP },
-};
-
-static struct rc_keymap avermedia_m135a_rm_jx_map = {
-        .map = {
-                .scan    = avermedia_m135a_rm_jx,
-                .size    = ARRAY_SIZE(avermedia_m135a_rm_jx),
-                .ir_type = IR_TYPE_NEC,
-                .name    = RC_MAP_AVERMEDIA_M135A_RM_JX,
-        }
-};
-
-static int __init init_rc_map_avermedia_m135a_rm_jx(void)
-{
-        return ir_register_map(&avermedia_m135a_rm_jx_map);
-}
-
-static void __exit exit_rc_map_avermedia_m135a_rm_jx(void)
-{
-        ir_unregister_map(&avermedia_m135a_rm_jx_map);
-}
-
-module_init(init_rc_map_avermedia_m135a_rm_jx)
-module_exit(exit_rc_map_avermedia_m135a_rm_jx)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a.c b/drivers/media/IR/keymaps/rc-avermedia-m135a.c
new file mode 100644
index 000000000000..e4471fb2ad1e
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-avermedia-m135a.c
@@ -0,0 +1,147 @@
+/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers
+ *
+ * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Avermedia M135A with RM-JX and RM-K6 remote controls
+ *
+ * On Avermedia M135A with IR model RM-JX, the same codes exist on both
+ * Positivo (BR) and original IR, initial version and remote control codes
+ * added by Mauro Carvalho Chehab <mchehab@infradead.org>
+ *
+ * Positivo also ships Avermedia M135A with model RM-K6, extra control
+ * codes added by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ */
+
+static struct ir_scancode avermedia_m135a[] = {
+        /* RM-JX */
+        { 0x0200, KEY_POWER2 },
+        { 0x022e, KEY_DOT },            /* '.' */
+        { 0x0201, KEY_MODE },           /* TV/FM or SOURCE */
+
+        { 0x0205, KEY_1 },
+        { 0x0206, KEY_2 },
+        { 0x0207, KEY_3 },
+        { 0x0209, KEY_4 },
+        { 0x020a, KEY_5 },
+        { 0x020b, KEY_6 },
+        { 0x020d, KEY_7 },
+        { 0x020e, KEY_8 },
+        { 0x020f, KEY_9 },
+        { 0x0211, KEY_0 },
+
+        { 0x0213, KEY_RIGHT },          /* -> or L */
+        { 0x0212, KEY_LEFT },           /* <- or R */
+
+        { 0x0217, KEY_SLEEP },          /* Capturar Imagem or Snapshot */
+        { 0x0210, KEY_SHUFFLE },        /* Amostra or 16 chan prev */
+
+        { 0x0303, KEY_CHANNELUP },
+        { 0x0302, KEY_CHANNELDOWN },
+        { 0x021f, KEY_VOLUMEUP },
+        { 0x021e, KEY_VOLUMEDOWN },
+        { 0x020c, KEY_ENTER },          /* Full Screen */
+
+        { 0x0214, KEY_MUTE },
+        { 0x0208, KEY_AUDIO },
+
+        { 0x0203, KEY_TEXT },           /* Teletext */
+        { 0x0204, KEY_EPG },
+        { 0x022b, KEY_TV2 },            /* TV2 or PIP */
+
+        { 0x021d, KEY_RED },
+        { 0x021c, KEY_YELLOW },
+        { 0x0301, KEY_GREEN },
+        { 0x0300, KEY_BLUE },
+
+        { 0x021a, KEY_PLAYPAUSE },
+        { 0x0219, KEY_RECORD },
+        { 0x0218, KEY_PLAY },
+        { 0x021b, KEY_STOP },
+
+        /* RM-K6 */
+        { 0x0401, KEY_POWER2 },
+        { 0x0406, KEY_MUTE },
+        { 0x0408, KEY_MODE },     /* TV/FM */
+
+        { 0x0409, KEY_1 },
+        { 0x040a, KEY_2 },
+        { 0x040b, KEY_3 },
+        { 0x040c, KEY_4 },
+        { 0x040d, KEY_5 },
+        { 0x040e, KEY_6 },
+        { 0x040f, KEY_7 },
+        { 0x0410, KEY_8 },
+        { 0x0411, KEY_9 },
+        { 0x044c, KEY_DOT },      /* '.' */
+        { 0x0412, KEY_0 },
+        { 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+        { 0x0413, KEY_AUDIO },
+        { 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+        { 0x0441, KEY_HOME },
+        { 0x0442, KEY_BACK },
+        { 0x0447, KEY_UP },
+        { 0x0448, KEY_DOWN },
+        { 0x0449, KEY_LEFT },
+        { 0x044a, KEY_RIGHT },
+        { 0x044b, KEY_OK },
+        { 0x0404, KEY_VOLUMEUP },
+        { 0x0405, KEY_VOLUMEDOWN },
+        { 0x0402, KEY_CHANNELUP },
+        { 0x0403, KEY_CHANNELDOWN },
+
+        { 0x0443, KEY_RED },
+        { 0x0444, KEY_GREEN },
+        { 0x0445, KEY_YELLOW },
+        { 0x0446, KEY_BLUE },
+
+        { 0x0414, KEY_TEXT },
+        { 0x0415, KEY_EPG },
+        { 0x041a, KEY_TV2 },      /* PIP */
+        { 0x041b, KEY_MHP },      /* Snapshot */
+
+        { 0x0417, KEY_RECORD },
+        { 0x0416, KEY_PLAYPAUSE },
+        { 0x0418, KEY_STOP },
+        { 0x0419, KEY_PAUSE },
+
+        { 0x041f, KEY_PREVIOUS },
+        { 0x041c, KEY_REWIND },
+        { 0x041d, KEY_FORWARD },
+        { 0x041e, KEY_NEXT },
+};
+
+static struct rc_keymap avermedia_m135a_map = {
+        .map = {
+                .scan    = avermedia_m135a,
+                .size    = ARRAY_SIZE(avermedia_m135a),
+                .ir_type = IR_TYPE_NEC,
+                .name    = RC_MAP_AVERMEDIA_M135A,
+        }
+};
+
+static int __init init_rc_map_avermedia_m135a(void)
+{
+        return ir_register_map(&avermedia_m135a_map);
+}
+
+static void __exit exit_rc_map_avermedia_m135a(void)
+{
+        ir_unregister_map(&avermedia_m135a_map);
+}
+
+module_init(init_rc_map_avermedia_m135a)
+module_exit(exit_rc_map_avermedia_m135a)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
new file mode 100644
index 000000000000..cf8d45717cb3
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
@@ -0,0 +1,95 @@
+/* avermedia-m733a-rm-k6.h - Keytable for avermedia_m733a_rm_k6 Remote Controller
+ *
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Avermedia M733A with IR model RM-K6
+ * This is the stock remote controller used with Positivo machines with M733A
+ * Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ */
+
+static struct ir_scancode avermedia_m733a_rm_k6[] = {
+        { 0x0401, KEY_POWER2 },
+        { 0x0406, KEY_MUTE },
+        { 0x0408, KEY_MODE },     /* TV/FM */
+
+        { 0x0409, KEY_1 },
+        { 0x040a, KEY_2 },
+        { 0x040b, KEY_3 },
+        { 0x040c, KEY_4 },
+        { 0x040d, KEY_5 },
+        { 0x040e, KEY_6 },
+        { 0x040f, KEY_7 },
+        { 0x0410, KEY_8 },
+        { 0x0411, KEY_9 },
+        { 0x044c, KEY_DOT },      /* '.' */
+        { 0x0412, KEY_0 },
+        { 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+        { 0x0413, KEY_AUDIO },
+        { 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+        { 0x0441, KEY_HOME },
+        { 0x0442, KEY_BACK },
+        { 0x0447, KEY_UP },
+        { 0x0448, KEY_DOWN },
+        { 0x0449, KEY_LEFT },
+        { 0x044a, KEY_RIGHT },
+        { 0x044b, KEY_OK },
+        { 0x0404, KEY_VOLUMEUP },
+        { 0x0405, KEY_VOLUMEDOWN },
+        { 0x0402, KEY_CHANNELUP },
+        { 0x0403, KEY_CHANNELDOWN },
+
+        { 0x0443, KEY_RED },
+        { 0x0444, KEY_GREEN },
+        { 0x0445, KEY_YELLOW },
+        { 0x0446, KEY_BLUE },
+
+        { 0x0414, KEY_TEXT },
+        { 0x0415, KEY_EPG },
+        { 0x041a, KEY_TV2 },      /* PIP */
+        { 0x041b, KEY_MHP },      /* Snapshot */
+
+        { 0x0417, KEY_RECORD },
+        { 0x0416, KEY_PLAYPAUSE },
+        { 0x0418, KEY_STOP },
+        { 0x0419, KEY_PAUSE },
+
+        { 0x041f, KEY_PREVIOUS },
+        { 0x041c, KEY_REWIND },
+        { 0x041d, KEY_FORWARD },
+        { 0x041e, KEY_NEXT },
+};
+
+static struct rc_keymap avermedia_m733a_rm_k6_map = {
+        .map = {
+                .scan    = avermedia_m733a_rm_k6,
+                .size    = ARRAY_SIZE(avermedia_m733a_rm_k6),
+                .ir_type = IR_TYPE_NEC,
+                .name    = RC_MAP_AVERMEDIA_M733A_RM_K6,
+        }
+};
+
+static int __init init_rc_map_avermedia_m733a_rm_k6(void)
+{
+        return ir_register_map(&avermedia_m733a_rm_k6_map);
+}
+
+static void __exit exit_rc_map_avermedia_m733a_rm_k6(void)
+{
+        ir_unregister_map(&avermedia_m733a_rm_k6_map);
+}
+
+module_init(init_rc_map_avermedia_m733a_rm_k6)
+module_exit(exit_rc_map_avermedia_m733a_rm_k6)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");