4 files changed, 37 insertions, 1 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 2ab5a120470d..107565c47274 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1157,7 +1157,8 @@ EXPORT_SYMBOL_GPL(ir_codes_purpletv);
 
 /* Mapping for the 28 key remote control as seen at
    http://www.sednacomputer.com/photo/cardbus-tv.jpg
-   Pavel Mihaylov <bin@bash.info> */
+   Pavel Mihaylov <bin@bash.info>
+   Also for the remote bundled with Kozumi KTV-01C card */
 IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
         [ 0x00 ] = KEY_0,
         [ 0x01 ] = KEY_1,
@@ -1188,6 +1189,11 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
         [ 0x1c ] = KEY_RADIO,          /* FM Radio */
         [ 0x1d ] = KEY_RECORD,
         [ 0x1e ] = KEY_PAUSE,
+        /* additional codes for Kozumi's remote */
+        [0x14] = KEY_INFO,        /* OSD */
+        [0x16] = KEY_OK,          /* OK */
+        [0x17] = KEY_DIGITS,      /* Plus */
+        [0x1f] = KEY_PLAY,        /* Play */
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_pctv_sedna);
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 417dd552dba9..22c2708e42ab 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3015,6 +3015,29 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr       = ADDR_UNSET,
                 .radio_addr       = ADDR_UNSET,
         },
+        [BTTV_BOARD_KOZUMI_KTV_01C] = {
+                /* Mauro Lacy <mauro@lacy.com.ar>
+                 * Based on MagicTV and Conceptronic CONTVFMi */
+
+                .name           = "Kozumi KTV-01C",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x008007,
+                .muxsel         = { 2, 3, 1, 1 },
+                .gpiomux        = { 0, 1, 2, 2 }, /* CONTVFMi */
+                /*gpiomux        = { 0, 1, 2, 3 }, /* MagicTV */
+                .gpiomute       = 3, /* CONTVFMi */
+                /*gpiomute      = 4, /* MagicTV */
+                .needs_tvaudio  = 0,
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+                .has_remote     = 1,
+        },
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index fc9ecb21eec6..a38af98f4cae 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv)
                 ir->mask_keyup   = 0x004000;
                 ir->polling      = 50; /* ms */
                 break;
+        case BTTV_BOARD_KOZUMI_KTV_01C:
+                ir_codes         = ir_codes_pctv_sedna;
+                ir->mask_keycode = 0x001f00;
+                ir->mask_keyup   = 0x006000;
+                ir->polling      = 50; /* ms */
+                break;
         }
         if (NULL == ir_codes) {
                 dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index ed0cd3b1a01e..0c859d949c78 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -174,6 +174,7 @@
 #define BTTV_BOARD_DVICO_FUSIONHDTV_2      0x94
 #define BTTV_BOARD_TYPHOON_TVTUNERPCI      0x95
 #define BTTV_BOARD_GEOVISION_GV600         0x96
+#define BTTV_BOARD_KOZUMI_KTV_01C          0x97
 
 
 /* more card-specific defines */