2 files changed, 104 insertions, 1 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 137f68bee39f..1879c304ae6d 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1782,3 +1782,72 @@ IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_tt_1500);
+
+/* DViCO FUSION HDTV 5 RT GOLD remote */
+IR_KEYTAB_TYPE ir_codes_fusion_gold[IR_KEYTAB_SIZE] = {
+
+        [ 0x0b ] = KEY_1,
+        [ 0x17 ] = KEY_2,
+        [ 0x1b ] = KEY_3,
+        [ 0x07 ] = KEY_4,
+        [ 0x50 ] = KEY_5,
+        [ 0x54 ] = KEY_6,
+        [ 0x48 ] = KEY_7,
+        [ 0x4c ] = KEY_8,
+        [ 0x58 ] = KEY_9,
+        [ 0x03 ] = KEY_0,
+
+        [ 0x5e ] = KEY_OK,
+        [ 0x51 ] = KEY_UP,
+        [ 0x53 ] = KEY_DOWN,
+        [ 0x5b ] = KEY_LEFT,
+        [ 0x5f ] = KEY_RIGHT,
+
+        [ 0x02 ] = KEY_TV,              /* Labeled DTV on remote */
+        [ 0x0e ] = KEY_MP3,
+        [ 0x1a ] = KEY_DVD,
+        [ 0x1e ] = KEY_RESERVED,        /* Labeled CPF on remote */
+        [ 0x16 ] = KEY_SETUP,
+        [ 0x46 ] = KEY_POWER2,          /* TV On/Off button on remote */
+        [ 0x0a ] = KEY_EPG,             /* Labeled Guide on remote */
+
+        [ 0x49 ] = KEY_BACK,
+        [ 0x59 ] = KEY_INFO,            /* Labeled MORE on remote */
+        [ 0x4d ] = KEY_MENU,            /* Labeled DVDMENU on remote */
+        [ 0x55 ] = KEY_CYCLEWINDOWS,    /* Labeled ALT-TAB on remote */
+        [ 0x0f ] = KEY_REDO,            /* Labeled |<< REPLAY on remote */
+        [ 0x12 ] = KEY_END,             /* Labeled >>| SKIP on remote */
+        [ 0x42 ] = KEY_GREEN,           /* Labeled START with a green
+                                         * MS windows logo on remote */
+
+        [ 0x15 ] = KEY_VOLUMEUP,
+        [ 0x05 ] = KEY_VOLUMEDOWN,
+        [ 0x11 ] = KEY_CHANNELUP,
+        [ 0x09 ] = KEY_CHANNELDOWN,
+
+        /* The following are not defined in kernel 2.6 and
+         * I cannot find suitable substitute key definitions.
+
+        [ 0x52 ] = KEY_PHOTO,
+        [ 0x5a ] = KEY_LIVE,
+        [ 0x19 ] = KEY_FOLDER,
+
+        */
+
+        [ 0x52 ] = KEY_RESERVED,
+        [ 0x5a ] = KEY_RESERVED,
+        [ 0x19 ] = KEY_RESERVED,
+
+        [ 0x13 ] = KEY_MODE,            /* 4:3 16:9 select */
+        [ 0x1f ] = KEY_ZOOM,
+
+        [ 0x43 ] = KEY_REWIND,
+        [ 0x47 ] = KEY_PLAYPAUSE,
+        [ 0x4f ] = KEY_FORWARD,
+        [ 0x57 ] = KEY_MUTE,
+        [ 0x0d ] = KEY_STOP,
+        [ 0x01 ] = KEY_RECORD,
+        [ 0x4e ] = KEY_POWER,
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_fusion_gold);
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index b3939a0bada0..3d5a28c2c929 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -10,6 +10,8 @@
  *      Ulrich Mueller <ulrich.mueller42@web.de>
  * modified for em2820 based USB TV tuners by
  *      Markus Rechberger <mrechberger@gmail.com>
+ * modified for DViCO Fusion HDTV 5 RT GOLD by
+ *      Chaogui Zhang <czhang1974@gmail.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
@@ -141,6 +143,32 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
+static int get_key_fusion_gold(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        unsigned char buf[4];
+
+        /* poll IR chip */
+        if (4 != i2c_master_recv(&ir->c,buf,4)) {
+                dprintk(1,"read error\n");
+                return -EIO;
+        }
+
+        if(buf[0] !=0 || buf[1] !=0 || buf[2] !=0 || buf[3] != 0)
+                dprintk(2, "ir fusion gold: 0x%2x 0x%2x 0x%2x 0x%2x\n",
+                        buf[0], buf[1], buf[2], buf[3]);
+
+        /* no key pressed or signal from other ir remote */
+        if(buf[0] != 0x1 ||  buf[1] != 0xfe)
+                return 0;
+
+        *ir_key = buf[2];
+        *ir_raw = (buf[2] << 8) | buf[3];
+
+        return 1;
+
+}
+
+
 static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char b;
@@ -363,6 +391,12 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                 ir_type     = IR_TYPE_OTHER;
                 ir_codes    = ir_codes_empty;
                 break;
+        case 0x6b:
+                name        = "FusionGold";
+                ir->get_key = get_key_fusion_gold;
+                ir_type     = IR_TYPE_RC5;
+                ir_codes    = ir_codes_fusion_gold;
+                break;
         case 0x7a:
         case 0x47:
         case 0x71:
@@ -474,7 +508,7 @@ static int ir_probe(struct i2c_adapter *adap)
         static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
         static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
         static const int probe_em28XX[] = { 0x30, 0x47, -1 };
-        static const int probe_cx88[] = { 0x18, 0x71, -1 };
+        static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
         const int *probe = NULL;
         struct i2c_client c;
         unsigned char buf;