aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.cx881
-rw-r--r--drivers/media/video/cx88/cx88-cards.c22
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c1
-rw-r--r--drivers/media/video/cx88/cx88.h3
4 files changed, 26 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index f6b0936c2fd5..f9636fd6bc32 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -49,3 +49,4 @@
49 48 -> Kworld MCE 200 Deluxe [17de:0841] 49 48 -> Kworld MCE 200 Deluxe [17de:0841]
50 49 -> PixelView PlayTV P7000 [1554:4813] 50 49 -> PixelView PlayTV P7000 [1554:4813]
51 50 -> NPG Tech Real TV [14f1:0842] 51 50 -> NPG Tech Real TV [14f1:0842]
52 51 -> WinFast DTV2000 H [107d:665e]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 352565f4fc99..368a65934e31 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1175,6 +1175,24 @@ struct cx88_board cx88_boards[] = {
1175 .gpio0 = 0x074a, 1175 .gpio0 = 0x074a,
1176 }, 1176 },
1177 }, 1177 },
1178 [CX88_BOARD_WINFAST_DTV2000H] = {
1179 /* video inputs and radio still in testing */
1180 .name = "WinFast DTV2000 H",
1181 .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
1182 .radio_type = UNSET,
1183 .tuner_addr = ADDR_UNSET,
1184 .radio_addr = ADDR_UNSET,
1185 .tda9887_conf = TDA9887_PRESENT,
1186 .input = {{
1187 .type = CX88_VMUX_TELEVISION,
1188 .vmux = 0,
1189 .gpio0 = 0x00017304,
1190 .gpio1 = 0x00008203,
1191 .gpio2 = 0x00017304,
1192 .gpio3 = 0x02000000,
1193 }},
1194 .dvb = 1,
1195 },
1178}; 1196};
1179const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 1197const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
1180 1198
@@ -1412,6 +1430,10 @@ struct cx88_subid cx88_subids[] = {
1412 .subvendor = 0x14f1, 1430 .subvendor = 0x14f1,
1413 .subdevice = 0x0842, 1431 .subdevice = 0x0842,
1414 .card = CX88_BOARD_NPGTECH_REALTV, 1432 .card = CX88_BOARD_NPGTECH_REALTV,
1433 },{
1434 .subvendor = 0x107d,
1435 .subdevice = 0x665e,
1436 .card = CX88_BOARD_WINFAST_DTV2000H,
1415 }, 1437 },
1416}; 1438};
1417const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); 1439const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index bf89cbf2b058..a3a628739a9c 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -533,6 +533,7 @@ static int dvb_register(struct cx8802_dev *dev)
533 dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 533 dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
534 } 534 }
535 break; 535 break;
536 case CX88_BOARD_WINFAST_DTV2000H:
536 case CX88_BOARD_HAUPPAUGE_HVR1100: 537 case CX88_BOARD_HAUPPAUGE_HVR1100:
537 case CX88_BOARD_HAUPPAUGE_HVR1100LP: 538 case CX88_BOARD_HAUPPAUGE_HVR1100LP:
538 dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config, 539 dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config,
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 5df6e41852bd..46a21f8f79ef 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -192,7 +192,8 @@ extern struct sram_channel cx88_sram_channels[];
192#define CX88_BOARD_PCHDTV_HD5500 47 192#define CX88_BOARD_PCHDTV_HD5500 47
193#define CX88_BOARD_KWORLD_MCE200_DELUXE 48 193#define CX88_BOARD_KWORLD_MCE200_DELUXE 48
194#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49 194#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49
195#define CX88_BOARD_NPGTECH_REALTV 50 195#define CX88_BOARD_NPGTECH_REALTV 50
196#define CX88_BOARD_WINFAST_DTV2000H 51
196 197
197enum cx88_itype { 198enum cx88_itype {
198 CX88_VMUX_COMPOSITE1 = 1, 199 CX88_VMUX_COMPOSITE1 = 1,