1 files changed, 80 insertions, 6 deletions

diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index e4252683a59..08848ebc682 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -40,16 +40,24 @@ static int pinnacle_remote = 0;
 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)");
 
+int ir_rc5_remote_gap = 885;
+module_param(ir_rc5_remote_gap, int, 0644);
+int ir_rc5_key_timeout = 115;
+module_param(ir_rc5_key_timeout, int, 0644);
+
 #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)
 
+/** rc5 functions */
+static int saa7134_rc5_irq(struct saa7134_dev *dev);
+
 /* -------------------- GPIO generic keycode builder -------------------- */
 
 static int build_key(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
         u32 gpio, data;
 
         /* rising SAA7134_GPIO_GPRESCAN reads the status */
@@ -134,16 +142,19 @@ static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 
 void saa7134_input_irq(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
 
-        if (!ir->polling)
+        if (!ir->polling && !ir->rc5_gpio) {
                 build_key(dev);
+        } else if (ir->rc5_gpio) {
+                saa7134_rc5_irq(dev);
+        }
 }
 
 static void saa7134_input_timer(unsigned long data)
 {
         struct saa7134_dev *dev = (struct saa7134_dev*)data;
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
         unsigned long timeout;
 
         build_key(dev);
@@ -151,7 +162,7 @@ static void saa7134_input_timer(unsigned long data)
         mod_timer(&ir->timer, timeout);
 }
 
-static void saa7134_ir_start(struct saa7134_dev *dev, struct saa7134_ir *ir)
+static void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
 {
         if (ir->polling) {
                 init_timer(&ir->timer);
@@ -159,6 +170,19 @@ static void saa7134_ir_start(struct saa7134_dev *dev, struct saa7134_ir *ir)
                 ir->timer.data     = (unsigned long)dev;
                 ir->timer.expires  = jiffies + HZ;
                 add_timer(&ir->timer);
+        } else if (ir->rc5_gpio) {
+                /* set timer_end for code completion */
+                init_timer(&ir->timer_end);
+                ir->timer_end.function = ir_rc5_timer_end;
+                ir->timer_end.data = (unsigned long)ir;
+                init_timer(&ir->timer_keyup);
+                ir->timer_keyup.function = ir_rc5_timer_keyup;
+                ir->timer_keyup.data = (unsigned long)ir;
+                ir->shift_by = 2;
+                ir->start = 0x2;
+                ir->addr = 0x17;
+                ir->rc5_key_timeout = ir_rc5_key_timeout;
+                ir->rc5_remote_gap = ir_rc5_remote_gap;
         }
 }
 
@@ -170,13 +194,14 @@ static void saa7134_ir_stop(struct saa7134_dev *dev)
 
 int saa7134_input_init1(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir;
+        struct card_ir *ir;
         struct input_dev *input_dev;
         IR_KEYTAB_TYPE *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 err;
 
@@ -295,6 +320,11 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keycode = 0x0001F00;
                 mask_keydown = 0x0040000;
                 break;
+        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+                ir_codes     = ir_codes_asus_pc39;
+                mask_keydown = 0x0040000;
+                rc5_gpio = 1;
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -316,6 +346,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         ir->mask_keydown = mask_keydown;
         ir->mask_keyup   = mask_keyup;
         ir->polling      = polling;
+        ir->rc5_gpio     = rc5_gpio;
 
         /* init input device */
         snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -402,6 +433,49 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
         }
 
 }
+
+static int saa7134_rc5_irq(struct saa7134_dev *dev)
+{
+        struct card_ir *ir = dev->remote;
+        struct timeval tv;
+        u32 gap;
+        unsigned long current_jiffies, timeout;
+
+        /* get time of bit */
+        current_jiffies = jiffies;
+        do_gettimeofday(&tv);
+
+        /* avoid overflow with gap >1s */
+        if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+                gap = 200000;
+        } else {
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                    tv.tv_usec - ir->base_time.tv_usec;
+        }
+
+        /* active code => add bit */
+        if (ir->active) {
+                /* only if in the code (otherwise spurious IRQ or timer
+                   late) */
+                if (ir->last_bit < 28) {
+                        ir->last_bit = (gap - ir_rc5_remote_gap / 2) /
+                            ir_rc5_remote_gap;
+                        ir->code |= 1 << ir->last_bit;
+                }
+                /* starting new code */
+        } else {
+                ir->active = 1;
+                ir->code = 0;
+                ir->base_time = tv;
+                ir->last_bit = 0;
+
+                timeout = current_jiffies + (500 + 30 * HZ) / 1000;
+                mod_timer(&ir->timer_end, timeout);
+        }
+
+        return 1;
+}
+
 /* ----------------------------------------------------------------------
  * Local variables:
  * c-basic-offset: 8