diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 29 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
4 files changed, 31 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 956cf833e931..3d02b1f27d28 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -41,3 +41,4 @@ | |||
41 | 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid [0070:9400,0070:9402] | 41 | 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid [0070:9400,0070:9402] |
42 | 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802] | 42 | 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802] |
43 | 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] | 43 | 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] |
44 | 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] | ||
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 6b17d1e1e520..ae2fdf62c8ba 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1009,6 +1009,29 @@ struct cx88_board cx88_boards[] = { | |||
1009 | }, | 1009 | }, |
1010 | .dvb = 1, | 1010 | .dvb = 1, |
1011 | }, | 1011 | }, |
1012 | [CX88_BOARD_KWORLD_DVB_T_CX22702] = { | ||
1013 | /* Kworld V-stream Xpert DVB-T with Thomson tuner */ | ||
1014 | /* DTT 7579 Conexant CX22702-19 Conexant CX2388x */ | ||
1015 | /* Manenti Marco <marco_manenti@colman.it> */ | ||
1016 | .name = "KWorld/VStream XPert DVB-T with cx22702", | ||
1017 | .tuner_type = TUNER_ABSENT, | ||
1018 | .radio_type = UNSET, | ||
1019 | .tuner_addr = ADDR_UNSET, | ||
1020 | .radio_addr = ADDR_UNSET, | ||
1021 | .input = {{ | ||
1022 | .type = CX88_VMUX_COMPOSITE1, | ||
1023 | .vmux = 1, | ||
1024 | .gpio0 = 0x0700, | ||
1025 | .gpio2 = 0x0101, | ||
1026 | },{ | ||
1027 | .type = CX88_VMUX_SVIDEO, | ||
1028 | .vmux = 2, | ||
1029 | .gpio0 = 0x0700, | ||
1030 | .gpio2 = 0x0101, | ||
1031 | }}, | ||
1032 | .dvb = 1, | ||
1033 | }, | ||
1034 | |||
1012 | }; | 1035 | }; |
1013 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 1036 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
1014 | 1037 | ||
@@ -1196,7 +1219,11 @@ struct cx88_subid cx88_subids[] = { | |||
1196 | .subvendor = 0x1822, | 1219 | .subvendor = 0x1822, |
1197 | .subdevice = 0x0025, | 1220 | .subdevice = 0x0025, |
1198 | .card = CX88_BOARD_DNTV_LIVE_DVB_T_PRO, | 1221 | .card = CX88_BOARD_DNTV_LIVE_DVB_T_PRO, |
1199 | }, | 1222 | },{ |
1223 | .subvendor = 0x17de, | ||
1224 | .subdevice = 0x08a1, | ||
1225 | .card = CX88_BOARD_KWORLD_DVB_T_CX22702, | ||
1226 | } | ||
1200 | }; | 1227 | }; |
1201 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); | 1228 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |
1202 | 1229 | ||
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index c63f20fdff48..dad8a0d564fb 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -439,6 +439,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
439 | break; | 439 | break; |
440 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: | 440 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: |
441 | case CX88_BOARD_CONEXANT_DVB_T1: | 441 | case CX88_BOARD_CONEXANT_DVB_T1: |
442 | case CX88_BOARD_KWORLD_DVB_T_CX22702: | ||
442 | case CX88_BOARD_WINFAST_DTV1000: | 443 | case CX88_BOARD_WINFAST_DTV1000: |
443 | dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, | 444 | dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, |
444 | &dev->core->i2c_adap); | 445 | &dev->core->i2c_adap); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 022ef13c45bc..120e5049a46f 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -185,6 +185,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
185 | #define CX88_BOARD_HAUPPAUGE_HVR1100 40 | 185 | #define CX88_BOARD_HAUPPAUGE_HVR1100 40 |
186 | #define CX88_BOARD_HAUPPAUGE_HVR1100LP 41 | 186 | #define CX88_BOARD_HAUPPAUGE_HVR1100LP 41 |
187 | #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42 | 187 | #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42 |
188 | #define CX88_BOARD_KWORLD_DVB_T_CX22702 43 | ||
188 | 189 | ||
189 | enum cx88_itype { | 190 | enum cx88_itype { |
190 | CX88_VMUX_COMPOSITE1 = 1, | 191 | CX88_VMUX_COMPOSITE1 = 1, |