5 files changed, 53 insertions, 0 deletions

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 0736518b2f8..3385f8b094a 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -80,3 +80,4 @@
  79 -> Terratec Cinergy HT PCI MKII                        [153b:1177]
  80 -> Hauppauge WinTV-IR Only                             [0070:9290]
  81 -> Leadtek WinFast DTV1800 Hybrid                      [107d:6654]
+ 82 -> WinFast DTV2000 H rev. J                            [107d:6f2b]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 39465301ec9..43aa7e06e5b 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1283,6 +1283,51 @@ static const struct cx88_board cx88_boards[] = {
                 },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_WINFAST_DTV2000H_J] = {
+                .name           = "WinFast DTV2000 H rev. J",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x00017300,
+                        .gpio1  = 0x00008207,
+                        .gpio2  = 0x00000000,
+                        .gpio3  = 0x02000000,
+                },{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x00018300,
+                        .gpio1  = 0x0000f207,
+                        .gpio2  = 0x00017304,
+                        .gpio3  = 0x02000000,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x00018301,
+                        .gpio1  = 0x0000f207,
+                        .gpio2  = 0x00017304,
+                        .gpio3  = 0x02000000,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x00018301,
+                        .gpio1  = 0x0000f207,
+                        .gpio2  = 0x00017304,
+                        .gpio3  = 0x02000000,
+                }},
+                .radio = {
+                         .type  = CX88_RADIO,
+                         .gpio0 = 0x00015702,
+                         .gpio1 = 0x0000f207,
+                         .gpio2 = 0x00015702,
+                         .gpio3 = 0x02000000,
+                },
+                .mpeg           = CX88_MPEG_DVB,
+        },
         [CX88_BOARD_GENIATECH_DVBS] = {
                 .name          = "Geniatech DVB-S",
                 .tuner_type    = TUNER_ABSENT,
@@ -2282,6 +2327,10 @@ static const struct cx88_subid cx88_subids[] = {
                 .subdevice = 0x665e,
                 .card      = CX88_BOARD_WINFAST_DTV2000H,
         },{
+                .subvendor = 0x107d,
+                .subdevice = 0x6f2b,
+                .card      = CX88_BOARD_WINFAST_DTV2000H_J,
+        },{
                 .subvendor = 0x18ac,
                 .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index e237b507659..1203e8d2c31 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -696,6 +696,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 break;
         case CX88_BOARD_WINFAST_DTV2000H:
+        case CX88_BOARD_WINFAST_DTV2000H_J:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR1100LP:
         case CX88_BOARD_HAUPPAUGE_HVR1300:
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index d91f5c51206..0abc3210072 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -225,6 +225,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->sampling = 1;
                 break;
         case CX88_BOARD_WINFAST_DTV2000H:
+        case CX88_BOARD_WINFAST_DTV2000H_J:
         case CX88_BOARD_WINFAST_DTV1800H:
                 ir_codes = ir_codes_winfast;
                 ir->gpio_addr = MO_GP0_IO;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 9d83762163f..d5cea41f420 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -237,6 +237,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII 79
 #define CX88_BOARD_HAUPPAUGE_IRONLY        80
 #define CX88_BOARD_WINFAST_DTV1800H        81
+#define CX88_BOARD_WINFAST_DTV2000H_J      82
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,