Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7cb47a14609eed6db2041fd1fe888027b2a3c3e0

Authored by Daniel Gimpelevich
Committed by Mauro Carvalho Chehab
1 parent 8083c5200e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (5685): Cx88: add support for ADS Tech Instant Video PCI 

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 3 changed files with 26 additions and 0 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.cx88
Diff comments   View file @ 7cb47a1
... ... @@ -55,4 +55,5 @@
55 55 54 -> Norwood Micro TV Tuner
56 56 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980]
57 57 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602]
  58 + 57 -> ADS Tech Instant Video PCI [1421:0390]
drivers/media/video/cx88/cx88-cards.c
Diff comments   View file @ 7cb47a1
... ... @@ -1335,6 +1335,26 @@
1335 1335 /* fixme: Add radio support */
1336 1336 .mpeg = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
1337 1337 },
  1338 + [CX88_BOARD_ADSTECH_PTV_390] = {
  1339 + .name = "ADS Tech Instant Video PCI",
  1340 + .tuner_type = TUNER_ABSENT,
  1341 + .radio_type = UNSET,
  1342 + .tuner_addr = ADDR_UNSET,
  1343 + .radio_addr = ADDR_UNSET,
  1344 + .input = {{
  1345 + .type = CX88_VMUX_DEBUG,
  1346 + .vmux = 3,
  1347 + .gpio0 = 0x04ff,
  1348 + },{
  1349 + .type = CX88_VMUX_COMPOSITE1,
  1350 + .vmux = 1,
  1351 + .gpio0 = 0x07fa,
  1352 + },{
  1353 + .type = CX88_VMUX_SVIDEO,
  1354 + .vmux = 2,
  1355 + .gpio0 = 0x07fa,
  1356 + }},
  1357 + },
1338 1358 };
1339 1359 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
1340 1360  
... ... @@ -1641,6 +1661,10 @@
1641 1661 .subvendor = 0x1421,
1642 1662 .subdevice = 0x0341, /* ADS Tech InstantTV DVB-S */
1643 1663 .card = CX88_BOARD_KWORLD_DVBS_100,
  1664 + },{
  1665 + .subvendor = 0x1421,
  1666 + .subdevice = 0x0390,
  1667 + .card = CX88_BOARD_ADSTECH_PTV_390,
1644 1668 },
1645 1669 };
1646 1670 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
drivers/media/video/cx88/cx88.h
Diff comments   View file @ 7cb47a1
... ... @@ -209,6 +209,7 @@
209 209 #define CX88_BOARD_NORWOOD_MICRO 54
210 210 #define CX88_BOARD_TE_DTV_250_OEM_SWANN 55
211 211 #define CX88_BOARD_HAUPPAUGE_HVR1300 56
  212 +#define CX88_BOARD_ADSTECH_PTV_390 57
212 213  
213 214 enum cx88_itype {
214 215 CX88_VMUX_COMPOSITE1 = 1,