V4L/DVB: saa7134: add support for Avermedia M733A
[safe/jmp/linux-2.6] / drivers / media / video / saa7134 / saa7134-input.c
index 8cfeb2b..f9ed804 100644 (file)
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
-static unsigned int disable_ir = 0;
+#define MODULE_NAME "saa7134"
+
+static unsigned int disable_ir;
 module_param(disable_ir, int, 0444);
 MODULE_PARM_DESC(disable_ir,"disable infrared remote support");
 
-static unsigned int ir_debug = 0;
+static unsigned int ir_debug;
 module_param(ir_debug, int, 0644);
 MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
 
-static int pinnacle_remote = 0;
+static int pinnacle_remote;
 module_param(pinnacle_remote, int, 0644);    /* Choose Pinnacle PCTV remote */
 MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
 
@@ -52,13 +55,22 @@ module_param(repeat_period, int, 0644);
 MODULE_PARM_DESC(repeat_period, "repeat period between "
     "keypresses when key is down");
 
+static unsigned int disable_other_ir;
+module_param(disable_other_ir, int, 0644);
+MODULE_PARM_DESC(disable_other_ir, "disable full codes of "
+    "alternative remotes from other manufacturers");
+
 #define dprintk(fmt, arg...)   if (ir_debug) \
        printk(KERN_DEBUG "%s/ir: " fmt, dev->name , ## arg)
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
-       printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
+       printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg)
 
-/** rc5 functions */
+/* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */
 static int saa7134_rc5_irq(struct saa7134_dev *dev);
+static int saa7134_nec_irq(struct saa7134_dev *dev);
+static int saa7134_raw_decode_irq(struct saa7134_dev *dev);
+static void nec_task(unsigned long data);
+static void saa7134_nec_timer(unsigned long data);
 
 /* -------------------- GPIO generic keycode builder -------------------- */
 
@@ -89,10 +101,19 @@ static int build_key(struct saa7134_dev *dev)
        dprintk("build_key gpio=0x%x mask=0x%x data=%d\n",
                gpio, ir->mask_keycode, data);
 
+       switch (dev->board) {
+       case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
+               if (data == ir->mask_keycode)
+                       ir_input_nokey(ir->dev, &ir->ir);
+               else
+                       ir_input_keydown(ir->dev, &ir->ir, data);
+               return 0;
+       }
+
        if (ir->polling) {
                if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
                    (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                       ir_input_keydown(ir->dev, &ir->ir, data, data);
+                       ir_input_keydown(ir->dev, &ir->ir, data);
                } else {
                        ir_input_nokey(ir->dev, &ir->ir);
                }
@@ -100,7 +121,7 @@ static int build_key(struct saa7134_dev *dev)
        else {  /* IRQ driven mode - handle key press and release in one go */
                if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
                    (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                       ir_input_keydown(ir->dev, &ir->ir, data, data);
+                       ir_input_keydown(ir->dev, &ir->ir, data);
                        ir_input_nokey(ir->dev, &ir->ir);
                }
        }
@@ -110,12 +131,114 @@ static int build_key(struct saa7134_dev *dev)
 
 /* --------------------- Chip specific I2C key builders ----------------- */
 
+static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       int gpio;
+       int attempt = 0;
+       unsigned char b;
+
+       /* We need this to access GPI Used by the saa_readl macro. */
+       struct saa7134_dev *dev = ir->c->adapter->algo_data;
+
+       if (dev == NULL) {
+               dprintk("get_key_flydvb_trio: "
+                        "gir->c->adapter->algo_data is NULL!\n");
+               return -EIO;
+       }
+
+       /* rising SAA7134_GPIGPRESCAN reads the status */
+       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+       gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+       if (0x40000 & ~gpio)
+               return 0; /* No button press */
+
+       /* No button press - only before first key pressed */
+       if (b == 0xFF)
+               return 0;
+
+       /* poll IR chip */
+       /* weak up the IR chip */
+       b = 0;
+
+       while (1 != i2c_master_send(ir->c, &b, 1)) {
+               if ((attempt++) < 10) {
+                       /*
+                        * wait a bit for next attempt -
+                        * I don't know how make it better
+                        */
+                       msleep(10);
+                       continue;
+               }
+               i2cdprintk("send wake up byte to pic16C505 (IR chip)"
+                          "failed %dx\n", attempt);
+               return -EIO;
+       }
+       if (1 != i2c_master_recv(ir->c, &b, 1)) {
+               i2cdprintk("read error\n");
+               return -EIO;
+       }
+
+       *ir_key = b;
+       *ir_raw = b;
+       return 1;
+}
+
+static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
+                                      u32 *ir_raw)
+{
+       unsigned char b;
+       int gpio;
+
+       /* <dev> is needed to access GPIO. Used by the saa_readl macro. */
+       struct saa7134_dev *dev = ir->c->adapter->algo_data;
+       if (dev == NULL) {
+               dprintk("get_key_msi_tvanywhere_plus: "
+                       "gir->c->adapter->algo_data is NULL!\n");
+               return -EIO;
+       }
+
+       /* rising SAA7134_GPIO_GPRESCAN reads the status */
+
+       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+       gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+       /* GPIO&0x40 is pulsed low when a button is pressed. Don't do
+          I2C receive if gpio&0x40 is not low. */
+
+       if (gpio & 0x40)
+               return 0;       /* No button press */
+
+       /* GPIO says there is a button press. Get it. */
+
+       if (1 != i2c_master_recv(ir->c, &b, 1)) {
+               i2cdprintk("read error\n");
+               return -EIO;
+       }
+
+       /* No button press */
+
+       if (b == 0xff)
+               return 0;
+
+       /* Button pressed */
+
+       dprintk("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b);
+       *ir_key = b;
+       *ir_raw = b;
+       return 1;
+}
+
 static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char b;
 
        /* poll IR chip */
-       if (1 != i2c_master_recv(&ir->c,&b,1)) {
+       if (1 != i2c_master_recv(ir->c, &b, 1)) {
                i2cdprintk("read error\n");
                return -EIO;
        }
@@ -138,7 +261,7 @@ static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        unsigned char buf[5], cod4, code3, code4;
 
        /* poll IR chip */
-       if (5 != i2c_master_recv(&ir->c,buf,5))
+       if (5 != i2c_master_recv(ir->c, buf, 5))
                return -EIO;
 
        cod4    = buf[4];
@@ -154,14 +277,146 @@ static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        return 1;
 }
 
+
+static int get_key_beholdm6xx(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       unsigned char data[12];
+       u32 gpio;
+
+       struct saa7134_dev *dev = ir->c->adapter->algo_data;
+
+       /* rising SAA7134_GPIO_GPRESCAN reads the status */
+       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+       gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+       if (0x400000 & ~gpio)
+               return 0; /* No button press */
+
+       ir->c->addr = 0x5a >> 1;
+
+       if (12 != i2c_master_recv(ir->c, data, 12)) {
+               i2cdprintk("read error\n");
+               return -EIO;
+       }
+       /* IR of this card normally decode signals NEC-standard from
+        * - Sven IHOO MT 5.1R remote. xxyye718
+        * - Sven DVD HD-10xx remote. xxyyf708
+        * - BBK ...
+        * - mayby others
+        * So, skip not our, if disable full codes mode.
+        */
+       if (data[10] != 0x6b && data[11] != 0x86 && disable_other_ir)
+               return 0;
+
+       /* Wrong data decode fix */
+       if (data[9] != (unsigned char)(~data[8]))
+               return 0;
+
+       *ir_key = data[9];
+       *ir_raw = data[9];
+
+       return 1;
+}
+
+/* Common (grey or coloured) pinnacle PCTV remote handling
+ *
+ */
+static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
+                           int parity_offset, int marker, int code_modulo)
+{
+       unsigned char b[4];
+       unsigned int start = 0,parity = 0,code = 0;
+
+       /* poll IR chip */
+       if (4 != i2c_master_recv(ir->c, b, 4)) {
+               i2cdprintk("read error\n");
+               return -EIO;
+       }
+
+       for (start = 0; start < ARRAY_SIZE(b); start++) {
+               if (b[start] == marker) {
+                       code=b[(start+parity_offset + 1) % 4];
+                       parity=b[(start+parity_offset) % 4];
+               }
+       }
+
+       /* Empty Request */
+       if (parity == 0)
+               return 0;
+
+       /* Repeating... */
+       if (ir->old == parity)
+               return 0;
+
+       ir->old = parity;
+
+       /* drop special codes when a key is held down a long time for the grey controller
+          In this case, the second bit of the code is asserted */
+       if (marker == 0xfe && (code & 0x40))
+               return 0;
+
+       code %= code_modulo;
+
+       *ir_raw = code;
+       *ir_key = code;
+
+       i2cdprintk("Pinnacle PCTV key %02x\n", code);
+
+       return 1;
+}
+
+/* The grey pinnacle PCTV remote
+ *
+ *  There are one issue with this remote:
+ *   - I2c packet does not change when the same key is pressed quickly. The workaround
+ *     is to hold down each key for about half a second, so that another code is generated
+ *     in the i2c packet, and the function can distinguish key presses.
+ *
+ * Sylvain Pasche <sylvain.pasche@gmail.com>
+ */
+static int get_key_pinnacle_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+
+       return get_key_pinnacle(ir, ir_key, ir_raw, 1, 0xfe, 0xff);
+}
+
+
+/* The new pinnacle PCTV remote (with the colored buttons)
+ *
+ * Ricardo Cerqueira <v4l@cerqueira.org>
+ */
+static int get_key_pinnacle_color(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       /* code_modulo parameter (0x88) is used to reduce code value to fit inside IR_KEYTAB_SIZE
+        *
+        * this is the only value that results in 42 unique
+        * codes < 128
+        */
+
+       return get_key_pinnacle(ir, ir_key, ir_raw, 2, 0x80, 0x88);
+}
+
 void saa7134_input_irq(struct saa7134_dev *dev)
 {
-       struct card_ir *ir = dev->remote;
+       struct card_ir *ir;
+
+       if (!dev || !dev->remote)
+               return;
+
+       ir = dev->remote;
+       if (!ir->running)
+               return;
 
-       if (!ir->polling && !ir->rc5_gpio) {
+       if (ir->nec_gpio) {
+               saa7134_nec_irq(dev);
+       } else if (!ir->polling && !ir->rc5_gpio && !ir->raw_decode) {
                build_key(dev);
        } else if (ir->rc5_gpio) {
                saa7134_rc5_irq(dev);
+       } else if (ir->raw_decode) {
+               saa7134_raw_decode_irq(dev);
        }
 }
 
@@ -174,8 +429,32 @@ static void saa7134_input_timer(unsigned long data)
        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
-void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
+void ir_raw_decode_timer_end(unsigned long data)
 {
+       struct saa7134_dev *dev = (struct saa7134_dev *)data;
+       struct card_ir *ir = dev->remote;
+
+       ir_raw_event_handle(dev->remote->dev);
+
+       ir->active = 0;
+}
+
+static int __saa7134_ir_start(void *priv)
+{
+       struct saa7134_dev *dev = priv;
+       struct card_ir *ir;
+
+       if (!dev)
+               return -EINVAL;
+
+       ir  = dev->remote;
+       if (!ir)
+               return -EINVAL;
+
+       if (ir->running)
+               return 0;
+
+       ir->running = 1;
        if (ir->polling) {
                setup_timer(&ir->timer, saa7134_input_timer,
                            (unsigned long)dev);
@@ -194,26 +473,130 @@ void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
                ir->addr = 0x17;
                ir->rc5_key_timeout = ir_rc5_key_timeout;
                ir->rc5_remote_gap = ir_rc5_remote_gap;
+       } else if (ir->nec_gpio) {
+               setup_timer(&ir->timer_keyup, saa7134_nec_timer,
+                           (unsigned long)dev);
+               tasklet_init(&ir->tlet, nec_task, (unsigned long)dev);
+       } else if (ir->raw_decode) {
+               /* set timer_end for code completion */
+               init_timer(&ir->timer_end);
+               ir->timer_end.function = ir_raw_decode_timer_end;
+               ir->timer_end.data = (unsigned long)dev;
+               ir->active = 0;
        }
+
+       return 0;
 }
 
-void saa7134_ir_stop(struct saa7134_dev *dev)
+static void __saa7134_ir_stop(void *priv)
 {
+       struct saa7134_dev *dev = priv;
+       struct card_ir *ir;
+
+       if (!dev)
+               return;
+
+       ir  = dev->remote;
+       if (!ir)
+               return;
+
+       if (!ir->running)
+               return;
        if (dev->remote->polling)
                del_timer_sync(&dev->remote->timer);
+       else if (ir->rc5_gpio)
+               del_timer_sync(&ir->timer_end);
+       else if (ir->nec_gpio)
+               tasklet_kill(&ir->tlet);
+       else if (ir->raw_decode) {
+               del_timer_sync(&ir->timer_end);
+               ir->active = 0;
+       }
+
+       ir->running = 0;
+
+       return;
+}
+
+int saa7134_ir_start(struct saa7134_dev *dev)
+{
+       if (dev->remote->users)
+               return __saa7134_ir_start(dev);
+
+       return 0;
+}
+
+void saa7134_ir_stop(struct saa7134_dev *dev)
+{
+       if (dev->remote->users)
+               __saa7134_ir_stop(dev);
+}
+
+static int saa7134_ir_open(void *priv)
+{
+       struct saa7134_dev *dev = priv;
+
+       dev->remote->users++;
+       return __saa7134_ir_start(dev);
+}
+
+static void saa7134_ir_close(void *priv)
+{
+       struct saa7134_dev *dev = priv;
+
+       dev->remote->users--;
+       if (!dev->remote->users)
+               __saa7134_ir_stop(dev);
+}
+
+
+int saa7134_ir_change_protocol(void *priv, u64 ir_type)
+{
+       struct saa7134_dev *dev = priv;
+       struct card_ir *ir = dev->remote;
+       u32 nec_gpio, rc5_gpio;
+
+       if (ir_type == IR_TYPE_RC5) {
+               dprintk("Changing protocol to RC5\n");
+               nec_gpio = 0;
+               rc5_gpio = 1;
+       } else if (ir_type == IR_TYPE_NEC) {
+               dprintk("Changing protocol to NEC\n");
+               nec_gpio = 1;
+               rc5_gpio = 0;
+       } else {
+               dprintk("IR protocol type %ud is not supported\n",
+                       (unsigned)ir_type);
+               return -EINVAL;
+       }
+
+       if (ir->running) {
+               saa7134_ir_stop(dev);
+               ir->nec_gpio = nec_gpio;
+               ir->rc5_gpio = rc5_gpio;
+               saa7134_ir_start(dev);
+       } else {
+               ir->nec_gpio = nec_gpio;
+               ir->rc5_gpio = rc5_gpio;
+       }
+
+       return 0;
 }
 
 int saa7134_input_init1(struct saa7134_dev *dev)
 {
        struct card_ir *ir;
        struct input_dev *input_dev;
-       IR_KEYTAB_TYPE *ir_codes = NULL;
+       char *ir_codes = NULL;
        u32 mask_keycode = 0;
        u32 mask_keydown = 0;
        u32 mask_keyup   = 0;
        int polling      = 0;
        int rc5_gpio     = 0;
-       int ir_type      = IR_TYPE_OTHER;
+       int nec_gpio     = 0;
+       int raw_decode   = 0;
+       int allow_protocol_change = 0;
+       u64 ir_type = IR_TYPE_OTHER;
        int err;
 
        if (dev->has_remote != SAA7134_REMOTE_GPIO)
@@ -227,27 +610,28 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_FLYVIDEO3000:
        case SAA7134_BOARD_FLYTVPLATINUM_FM:
        case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
-               ir_codes     = ir_codes_flyvideo;
+       case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM:
+               ir_codes     = RC_MAP_FLYVIDEO;
                mask_keycode = 0xEC00000;
                mask_keydown = 0x0040000;
                break;
        case SAA7134_BOARD_CINERGY400:
        case SAA7134_BOARD_CINERGY600:
        case SAA7134_BOARD_CINERGY600_MK3:
-               ir_codes     = ir_codes_cinergy;
+               ir_codes     = RC_MAP_CINERGY;
                mask_keycode = 0x00003f;
                mask_keyup   = 0x040000;
                break;
        case SAA7134_BOARD_ECS_TVP3XP:
        case SAA7134_BOARD_ECS_TVP3XP_4CB5:
-               ir_codes     = ir_codes_eztv;
+               ir_codes     = RC_MAP_EZTV;
                mask_keycode = 0x00017c;
                mask_keyup   = 0x000002;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_KWORLD_XPERT:
        case SAA7134_BOARD_AVACSSMARTTV:
-               ir_codes     = ir_codes_pixelview;
+               ir_codes     = RC_MAP_PIXELVIEW;
                mask_keycode = 0x00001F;
                mask_keyup   = 0x000020;
                polling      = 50; // ms
@@ -257,11 +641,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_AVERMEDIA_305:
        case SAA7134_BOARD_AVERMEDIA_307:
        case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
+       case SAA7134_BOARD_AVERMEDIA_STUDIO_505:
        case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
        case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
+       case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:
        case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
        case SAA7134_BOARD_AVERMEDIA_M102:
-               ir_codes     = ir_codes_avermedia;
+       case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
+               ir_codes     = RC_MAP_AVERMEDIA;
                mask_keycode = 0x0007C8;
                mask_keydown = 0x000010;
                polling      = 50; // ms
@@ -269,9 +656,23 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
                saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                break;
+       case SAA7134_BOARD_AVERMEDIA_M135A:
+               ir_codes     = RC_MAP_AVERMEDIA_M135A_RM_JX;
+               mask_keydown = 0x0040000;       /* Enable GPIO18 line on both edges */
+               mask_keyup   = 0x0040000;
+               mask_keycode = 0xffff;
+               raw_decode   = 1;
+               break;
+       case SAA7134_BOARD_AVERMEDIA_M733A:
+               ir_codes     = RC_MAP_AVERMEDIA_M733A_RM_K6;
+               mask_keydown = 0x0040000;
+               mask_keyup   = 0x0040000;
+               mask_keycode = 0xffff;
+               raw_decode   = 1;
+               break;
        case SAA7134_BOARD_AVERMEDIA_777:
        case SAA7134_BOARD_AVERMEDIA_A16AR:
-               ir_codes     = ir_codes_avermedia;
+               ir_codes     = RC_MAP_AVERMEDIA;
                mask_keycode = 0x02F200;
                mask_keydown = 0x000400;
                polling      = 50; // ms
@@ -279,28 +680,62 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                saa_setb(SAA7134_GPIO_GPMODE1, 0x1);
                saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1);
                break;
+       case SAA7134_BOARD_AVERMEDIA_A16D:
+               ir_codes     = RC_MAP_AVERMEDIA_A16D;
+               mask_keycode = 0x02F200;
+               mask_keydown = 0x000400;
+               polling      = 50; /* ms */
+               /* Without this we won't receive key up events */
+               saa_setb(SAA7134_GPIO_GPMODE1, 0x1);
+               saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1);
+               break;
        case SAA7134_BOARD_KWORLD_TERMINATOR:
-               ir_codes     = ir_codes_pixelview;
+               ir_codes     = RC_MAP_PIXELVIEW;
                mask_keycode = 0x00001f;
                mask_keyup   = 0x000060;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_MANLI_MTV001:
        case SAA7134_BOARD_MANLI_MTV002:
-       case SAA7134_BOARD_BEHOLD_409FM:
-               ir_codes     = ir_codes_manli;
+               ir_codes     = RC_MAP_MANLI;
                mask_keycode = 0x001f00;
                mask_keyup   = 0x004000;
+               polling      = 50; /* ms */
+               break;
+       case SAA7134_BOARD_BEHOLD_409FM:
+       case SAA7134_BOARD_BEHOLD_401:
+       case SAA7134_BOARD_BEHOLD_403:
+       case SAA7134_BOARD_BEHOLD_403FM:
+       case SAA7134_BOARD_BEHOLD_405:
+       case SAA7134_BOARD_BEHOLD_405FM:
+       case SAA7134_BOARD_BEHOLD_407:
+       case SAA7134_BOARD_BEHOLD_407FM:
+       case SAA7134_BOARD_BEHOLD_409:
+       case SAA7134_BOARD_BEHOLD_505FM:
+       case SAA7134_BOARD_BEHOLD_505RDS_MK5:
+       case SAA7134_BOARD_BEHOLD_505RDS_MK3:
+       case SAA7134_BOARD_BEHOLD_507_9FM:
+       case SAA7134_BOARD_BEHOLD_507RDS_MK3:
+       case SAA7134_BOARD_BEHOLD_507RDS_MK5:
+               ir_codes     = RC_MAP_MANLI;
+               mask_keycode = 0x003f00;
+               mask_keyup   = 0x004000;
+               polling      = 50; /* ms */
+               break;
+       case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:
+               ir_codes     = RC_MAP_BEHOLD_COLUMBUS;
+               mask_keycode = 0x003f00;
+               mask_keyup   = 0x004000;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
-               ir_codes     = ir_codes_pctv_sedna;
+               ir_codes     = RC_MAP_PCTV_SEDNA;
                mask_keycode = 0x001f00;
                mask_keyup   = 0x004000;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_GOTVIEW_7135:
-               ir_codes     = ir_codes_gotview7135;
+               ir_codes     = RC_MAP_GOTVIEW7135;
                mask_keycode = 0x0003CC;
                mask_keydown = 0x000010;
                polling      = 5; /* ms */
@@ -309,49 +744,85 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_VIDEOMATE_TV_PVR:
        case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
        case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
-               ir_codes     = ir_codes_videomate_tv_pvr;
+               ir_codes     = RC_MAP_VIDEOMATE_TV_PVR;
                mask_keycode = 0x00003F;
                mask_keyup   = 0x400000;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_PROTEUS_2309:
-               ir_codes     = ir_codes_proteus_2309;
+               ir_codes     = RC_MAP_PROTEUS_2309;
                mask_keycode = 0x00007F;
                mask_keyup   = 0x000080;
                polling      = 50; // ms
                break;
        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
        case SAA7134_BOARD_VIDEOMATE_DVBT_200:
-               ir_codes     = ir_codes_videomate_tv_pvr;
+               ir_codes     = RC_MAP_VIDEOMATE_TV_PVR;
                mask_keycode = 0x003F00;
                mask_keyup   = 0x040000;
                break;
        case SAA7134_BOARD_FLYDVBS_LR300:
        case SAA7134_BOARD_FLYDVBT_LR301:
        case SAA7134_BOARD_FLYDVBTDUO:
-               ir_codes     = ir_codes_flydvb;
+               ir_codes     = RC_MAP_FLYDVB;
                mask_keycode = 0x0001F00;
                mask_keydown = 0x0040000;
                break;
        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
        case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
-               ir_codes     = ir_codes_asus_pc39;
+       case SAA7134_BOARD_ASUSTeK_P7131_ANALOG:
+               ir_codes     = RC_MAP_ASUS_PC39;
                mask_keydown = 0x0040000;
                rc5_gpio = 1;
                break;
        case SAA7134_BOARD_ENCORE_ENLTV:
        case SAA7134_BOARD_ENCORE_ENLTV_FM:
-               ir_codes     = ir_codes_encore_enltv;
+               ir_codes     = RC_MAP_ENCORE_ENLTV;
                mask_keycode = 0x00007f;
                mask_keyup   = 0x040000;
                polling      = 50; // ms
                break;
+       case SAA7134_BOARD_ENCORE_ENLTV_FM53:
+               ir_codes     = RC_MAP_ENCORE_ENLTV_FM53;
+               mask_keydown = 0x0040000;
+               mask_keycode = 0x00007f;
+               nec_gpio = 1;
+               break;
        case SAA7134_BOARD_10MOONSTVMASTER3:
-               ir_codes     = ir_codes_encore_enltv;
+               ir_codes     = RC_MAP_ENCORE_ENLTV;
                mask_keycode = 0x5f80000;
                mask_keyup   = 0x8000000;
                polling      = 50; //ms
                break;
+       case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
+               ir_codes     = RC_MAP_GENIUS_TVGO_A11MCE;
+               mask_keycode = 0xff;
+               mask_keydown = 0xf00000;
+               polling = 50; /* ms */
+               break;
+       case SAA7134_BOARD_REAL_ANGEL_220:
+               ir_codes     = RC_MAP_REAL_AUDIO_220_32_KEYS;
+               mask_keycode = 0x3f00;
+               mask_keyup   = 0x4000;
+               polling = 50; /* ms */
+               break;
+       case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
+               ir_codes     = RC_MAP_KWORLD_PLUS_TV_ANALOG;
+               mask_keycode = 0x7f;
+               polling = 40; /* ms */
+               break;
+       case SAA7134_BOARD_VIDEOMATE_S350:
+               ir_codes     = RC_MAP_VIDEOMATE_S350;
+               mask_keycode = 0x003f00;
+               mask_keydown = 0x040000;
+               break;
+       case SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S:
+               ir_codes     = RC_MAP_WINFAST;
+               mask_keycode = 0x5f00;
+               mask_keyup   = 0x020000;
+               polling      = 50; /* ms */
+               break;
+       break;
        }
        if (NULL == ir_codes) {
                printk("%s: Oops: IR config error [card=%d]\n",
@@ -367,6 +838,9 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        }
 
        ir->dev = input_dev;
+       dev->remote = ir;
+
+       ir->running = 0;
 
        /* init hardware-specific stuff */
        ir->mask_keycode = mask_keycode;
@@ -374,6 +848,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        ir->mask_keyup   = mask_keyup;
        ir->polling      = polling;
        ir->rc5_gpio     = rc5_gpio;
+       ir->nec_gpio     = nec_gpio;
+       ir->raw_decode   = raw_decode;
 
        /* init input device */
        snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -381,7 +857,23 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                 pci_name(dev->pci));
 
-       ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+
+       ir->props.priv = dev;
+       ir->props.open = saa7134_ir_open;
+       ir->props.close = saa7134_ir_close;
+
+       if (raw_decode)
+               ir->props.driver_type = RC_DRIVER_IR_RAW;
+
+       if (!raw_decode && allow_protocol_change) {
+               ir->props.allowed_protos = IR_TYPE_RC5 | IR_TYPE_NEC;
+               ir->props.change_protocol = saa7134_ir_change_protocol;
+       }
+
+       err = ir_input_init(input_dev, &ir->ir, ir_type);
+       if (err < 0)
+               goto err_out_free;
+
        input_dev->name = ir->name;
        input_dev->phys = ir->phys;
        input_dev->id.bustype = BUS_PCI;
@@ -395,12 +887,9 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        }
        input_dev->dev.parent = &dev->pci->dev;
 
-       dev->remote = ir;
-       saa7134_ir_start(dev, ir);
-
-       err = input_register_device(ir->dev);
+       err = ir_input_register(ir->dev, ir_codes, &ir->props, MODULE_NAME);
        if (err)
-               goto err_out_stop;
+               goto err_out_free;
 
        /* the remote isn't as bouncy as a keyboard */
        ir->dev->rep[REP_DELAY] = repeat_delay;
@@ -408,11 +897,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 
        return 0;
 
- err_out_stop:
-       saa7134_ir_stop(dev);
+err_out_free:
        dev->remote = NULL;
- err_out_free:
-       input_free_device(input_dev);
        kfree(ir);
        return err;
 }
@@ -423,46 +909,139 @@ void saa7134_input_fini(struct saa7134_dev *dev)
                return;
 
        saa7134_ir_stop(dev);
-       input_unregister_device(dev->remote->dev);
+       ir_input_unregister(dev->remote->dev);
        kfree(dev->remote);
        dev->remote = NULL;
 }
 
-void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
+void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
 {
+       struct i2c_board_info info;
+
+       struct i2c_msg msg_msi = {
+               .addr = 0x50,
+               .flags = I2C_M_RD,
+               .len = 0,
+               .buf = NULL,
+       };
+
+       int rc;
+
        if (disable_ir) {
-               dprintk("Found supported i2c remote, but IR has been disabled\n");
-               ir->get_key=NULL;
+               dprintk("IR has been disabled, not probing for i2c remote\n");
                return;
        }
 
+       memset(&info, 0, sizeof(struct i2c_board_info));
+       memset(&dev->init_data, 0, sizeof(dev->init_data));
+       strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+
        switch (dev->board) {
        case SAA7134_BOARD_PINNACLE_PCTV_110i:
        case SAA7134_BOARD_PINNACLE_PCTV_310i:
-               snprintf(ir->c.name, sizeof(ir->c.name), "Pinnacle PCTV");
+               dev->init_data.name = "Pinnacle PCTV";
                if (pinnacle_remote == 0) {
-                       ir->get_key   = get_key_pinnacle_color;
-                       ir->ir_codes = ir_codes_pinnacle_color;
+                       dev->init_data.get_key = get_key_pinnacle_color;
+                       dev->init_data.ir_codes = RC_MAP_PINNACLE_COLOR;
+                       info.addr = 0x47;
                } else {
-                       ir->get_key   = get_key_pinnacle_grey;
-                       ir->ir_codes = ir_codes_pinnacle_grey;
+                       dev->init_data.get_key = get_key_pinnacle_grey;
+                       dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY;
+                       info.addr = 0x47;
                }
                break;
        case SAA7134_BOARD_UPMOST_PURPLE_TV:
-               snprintf(ir->c.name, sizeof(ir->c.name), "Purple TV");
-               ir->get_key   = get_key_purpletv;
-               ir->ir_codes  = ir_codes_purpletv;
+               dev->init_data.name = "Purple TV";
+               dev->init_data.get_key = get_key_purpletv;
+               dev->init_data.ir_codes = RC_MAP_PURPLETV;
+               info.addr = 0x7a;
+               break;
+       case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
+               dev->init_data.name = "MSI TV@nywhere Plus";
+               dev->init_data.get_key = get_key_msi_tvanywhere_plus;
+               dev->init_data.ir_codes = RC_MAP_MSI_TVANYWHERE_PLUS;
+               info.addr = 0x30;
+               /* MSI TV@nywhere Plus controller doesn't seem to
+                  respond to probes unless we read something from
+                  an existing device. Weird...
+                  REVISIT: might no longer be needed */
+               rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
+               dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
+                       msg_msi.addr, dev->i2c_adap.name,
+                       (1 == rc) ? "yes" : "no");
                break;
        case SAA7134_BOARD_HAUPPAUGE_HVR1110:
-               snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110");
-               ir->get_key   = get_key_hvr1110;
-               ir->ir_codes  = ir_codes_hauppauge_new;
+               dev->init_data.name = "HVR 1110";
+               dev->init_data.get_key = get_key_hvr1110;
+               dev->init_data.ir_codes = RC_MAP_HAUPPAUGE_NEW;
+               info.addr = 0x71;
                break;
-       default:
-               dprintk("Shouldn't get here: Unknown board %x for I2C IR?\n",dev->board);
+       case SAA7134_BOARD_BEHOLD_607FM_MK3:
+       case SAA7134_BOARD_BEHOLD_607FM_MK5:
+       case SAA7134_BOARD_BEHOLD_609FM_MK3:
+       case SAA7134_BOARD_BEHOLD_609FM_MK5:
+       case SAA7134_BOARD_BEHOLD_607RDS_MK3:
+       case SAA7134_BOARD_BEHOLD_607RDS_MK5:
+       case SAA7134_BOARD_BEHOLD_609RDS_MK3:
+       case SAA7134_BOARD_BEHOLD_609RDS_MK5:
+       case SAA7134_BOARD_BEHOLD_M6:
+       case SAA7134_BOARD_BEHOLD_M63:
+       case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+       case SAA7134_BOARD_BEHOLD_H6:
+       case SAA7134_BOARD_BEHOLD_X7:
+       case SAA7134_BOARD_BEHOLD_H7:
+       case SAA7134_BOARD_BEHOLD_A7:
+               dev->init_data.name = "BeholdTV";
+               dev->init_data.get_key = get_key_beholdm6xx;
+               dev->init_data.ir_codes = RC_MAP_BEHOLD;
+               dev->init_data.type = IR_TYPE_NEC;
+               info.addr = 0x2d;
+               break;
+       case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
+       case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
+               info.addr = 0x40;
                break;
+       case SAA7134_BOARD_FLYDVB_TRIO:
+               dev->init_data.name = "FlyDVB Trio";
+               dev->init_data.get_key = get_key_flydvb_trio;
+               dev->init_data.ir_codes = RC_MAP_FLYDVB;
+               info.addr = 0x0b;
+               break;
+       default:
+               dprintk("No I2C IR support for board %x\n", dev->board);
+               return;
+       }
+
+       if (dev->init_data.name)
+               info.platform_data = &dev->init_data;
+       i2c_new_device(&dev->i2c_adap, &info);
+}
+
+static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
+{
+       struct card_ir  *ir = dev->remote;
+       unsigned long   timeout;
+       int space;
+
+       /* Generate initial event */
+       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       space = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;
+       ir_raw_event_store_edge(dev->remote->dev, space ? IR_SPACE : IR_PULSE);
+
+
+       /*
+        * Wait 15 ms from the start of the first IR event before processing
+        * the event. This time is enough for NEC protocol. May need adjustments
+        * to work with other protocols.
+        */
+       if (!ir->active) {
+               timeout = jiffies + jiffies_to_msecs(15);
+               mod_timer(&ir->timer_end, timeout);
+               ir->active = 1;
        }
 
+       return 1;
 }
 
 static int saa7134_rc5_irq(struct saa7134_dev *dev)
@@ -507,8 +1086,124 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev)
        return 1;
 }
 
-/* ----------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
+/* On NEC protocol, One has 2.25 ms, and zero has 1.125 ms
+   The first pulse (start) has 9 + 4.5 ms
  */
+
+static void saa7134_nec_timer(unsigned long data)
+{
+       struct saa7134_dev *dev = (struct saa7134_dev *) data;
+       struct card_ir *ir = dev->remote;
+
+       dprintk("Cancel key repeat\n");
+
+       ir_input_nokey(ir->dev, &ir->ir);
+}
+
+static void nec_task(unsigned long data)
+{
+       struct saa7134_dev *dev = (struct saa7134_dev *) data;
+       struct card_ir *ir;
+       struct timeval tv;
+       int count, pulse, oldpulse, gap;
+       u32 ircode = 0, not_code = 0;
+       int ngap = 0;
+
+       if (!data) {
+               printk(KERN_ERR "saa713x/ir: Can't recover dev struct\n");
+               /* GPIO will be kept disabled */
+               return;
+       }
+
+       ir = dev->remote;
+
+       /* rising SAA7134_GPIO_GPRESCAN reads the status */
+       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+       oldpulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;
+       pulse = oldpulse;
+
+       do_gettimeofday(&tv);
+       ir->base_time = tv;
+
+       /* Decode NEC pulsecode. This code can take up to 76.5 ms to run.
+          Unfortunately, using IRQ to decode pulse didn't work, since it uses
+          a pulse train of 38KHz. This means one pulse on each 52 us
+        */
+       do {
+               /* Wait until the end of pulse/space or 5 ms */
+               for (count = 0; count < 500; count++)  {
+                       udelay(10);
+                       /* rising SAA7134_GPIO_GPRESCAN reads the status */
+                       saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                       saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                       pulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)
+                               & ir->mask_keydown;
+                       if (pulse != oldpulse)
+                               break;
+               }
+
+               do_gettimeofday(&tv);
+               gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                               tv.tv_usec - ir->base_time.tv_usec;
+
+               if (!pulse) {
+                       /* Bit 0 has 560 us, while bit 1 has 1120 us.
+                          Do something only if bit == 1
+                        */
+                       if (ngap && (gap > 560 + 280)) {
+                               unsigned int shift = ngap - 1;
+
+                               /* Address first, then command */
+                               if (shift < 8) {
+                                       shift += 8;
+                                       ircode |= 1 << shift;
+                               } else if (shift < 16) {
+                                       not_code |= 1 << shift;
+                               } else if (shift < 24) {
+                                       shift -= 16;
+                                       ircode |= 1 << shift;
+                               } else {
+                                       shift -= 24;
+                                       not_code |= 1 << shift;
+                               }
+                       }
+                       ngap++;
+               }
+
+
+               ir->base_time = tv;
+
+               /* TIMEOUT - Long pulse */
+               if (gap >= 5000)
+                       break;
+               oldpulse = pulse;
+       } while (ngap < 32);
+
+       if (ngap == 32) {
+               /* FIXME: should check if not_code == ~ircode */
+               ir->code = ir_extract_bits(ircode, ir->mask_keycode);
+
+               dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",
+                        ir->code, ircode, not_code);
+
+               ir_input_keydown(ir->dev, &ir->ir, ir->code);
+       } else
+               dprintk("Repeat last key\n");
+
+       /* Keep repeating the last key */
+       mod_timer(&ir->timer_keyup, jiffies + msecs_to_jiffies(150));
+
+       saa_setl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18_P);
+}
+
+static int saa7134_nec_irq(struct saa7134_dev *dev)
+{
+       struct card_ir *ir = dev->remote;
+
+       saa_clearl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18_P);
+       tasklet_schedule(&ir->tlet);
+
+       return 1;
+}