aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c16
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c1
-rw-r--r--drivers/media/video/cx88/cx88.h1
3 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 388440789dfb..6a85ba111fb1 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -852,6 +852,18 @@ struct cx88_board cx88_boards[] = {
852 .gpio3 = 0x00000000, 852 .gpio3 = 0x00000000,
853 }}, 853 }},
854 }, 854 },
855 [CX88_BOARD_WINFAST_DTV1000] = {
856 .name = "WinFast DTV1000-T",
857 .tuner_type = TUNER_ABSENT,
858 .radio_type = UNSET,
859 .tuner_addr = ADDR_UNSET,
860 .radio_addr = ADDR_UNSET,
861 .input = {{
862 .type = CX88_VMUX_DVB,
863 .vmux = 0,
864 }},
865 .dvb = 1,
866 },
855}; 867};
856const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 868const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
857 869
@@ -991,6 +1003,10 @@ struct cx88_subid cx88_subids[] = {
991 .subvendor = PCI_VENDOR_ID_ATI, 1003 .subvendor = PCI_VENDOR_ID_ATI,
992 .subdevice = 0xa101, 1004 .subdevice = 0xa101,
993 .card = CX88_BOARD_ATI_HDTVWONDER, 1005 .card = CX88_BOARD_ATI_HDTVWONDER,
1006 },{
1007 .subvendor = 0x107d,
1008 .subdevice = 0x665f,
1009 .card = CX88_BOARD_WINFAST_DTV1000,
994 }, 1010 },
995}; 1011};
996const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); 1012const 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 82e686135f60..579de88e3081 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -299,6 +299,7 @@ static int dvb_register(struct cx8802_dev *dev)
299 break; 299 break;
300 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: 300 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
301 case CX88_BOARD_CONEXANT_DVB_T1: 301 case CX88_BOARD_CONEXANT_DVB_T1:
302 case CX88_BOARD_WINFAST_DTV1000:
302 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, 303 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
303 &dev->core->i2c_adap); 304 &dev->core->i2c_adap);
304 break; 305 break;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index a690569f345d..ea5c092a779e 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -177,6 +177,7 @@ extern struct sram_channel cx88_sram_channels[];
177#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32 177#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32
178#define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33 178#define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33
179#define CX88_BOARD_ATI_HDTVWONDER 34 179#define CX88_BOARD_ATI_HDTVWONDER 34
180#define CX88_BOARD_WINFAST_DTV1000 35
180 181
181enum cx88_itype { 182enum cx88_itype {
182 CX88_VMUX_COMPOSITE1 = 1, 183 CX88_VMUX_COMPOSITE1 = 1,