4 files changed, 24 insertions, 1 deletions

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index f85907ee2416..3cc36e1f3992 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -46,3 +46,4 @@
  45 -> KWorld HardwareMpegTV XPert                         [17de:0840]
  46 -> DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]
  47 -> pcHDTV HD5500 HDTV                                  [7063:5500]
+ 48 -> Kworld MCE 200 Deluxe                               [17de:0841]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 689d210c90ac..344c16eb0b0d 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1115,6 +1115,22 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .dvb            = 1,
         },
+        [CX88_BOARD_KWORLD_MCE200_DELUXE] = {
+                /* FIXME: tested TV input only, disabled composite,
+                   svideo and radio until they can be tested also. */
+                .name           = "Kworld MCE 200 Deluxe",
+                .tuner_type     = TUNER_TENA_9533_DI,
+                .radio_type     = UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x0000BDE6
+                }},
+                .blackbird = 1,
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1336,6 +1352,10 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x7063,
                 .subdevice = 0x5500,
                 .card      = CX88_BOARD_PCHDTV_HD5500,
+        },{
+                .subvendor = 0x17de,
+                .subdevice = 0x0841,
+                .card      = CX88_BOARD_KWORLD_MCE200_DELUXE,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 641a0c5a6490..3d3376d590a5 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -148,7 +148,8 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 
         if (cx88_boards[core->board].blackbird) {
                 /* sets sound input from external adc */
-                if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)
+                if ((core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)||
+                    (core->board == CX88_BOARD_KWORLD_MCE200_DELUXE))
                         cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
                 else
                         cx_set(AUD_CTL, EN_I2SIN_ENABLE);
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 12944f7a9be2..84c87707203b 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -190,6 +190,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45
 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46
 #define CX88_BOARD_PCHDTV_HD5500           47
+#define CX88_BOARD_KWORLD_MCE200_DELUXE    48
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,