diff options
author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2007-05-17 17:10:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:23:37 -0400 |
commit | 7cb47a14609eed6db2041fd1fe888027b2a3c3e0 (patch) | |
tree | 487d98cedafd8ca098babac2621c2dcd1d241dae | |
parent | 8083c5200e74a5db11c9671bfc1bcaefe8c48737 (diff) |
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>
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 24 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 60f838beb9c8..82ac8250e978 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -55,3 +55,4 @@ | |||
55 | 54 -> Norwood Micro TV Tuner | 55 | 54 -> Norwood Micro TV Tuner |
56 | 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980] | 56 | 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980] |
57 | 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602] | 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] | ||
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index e61102dc8ad7..6a136ddbccf8 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1335,6 +1335,26 @@ struct cx88_board cx88_boards[] = { | |||
1335 | /* fixme: Add radio support */ | 1335 | /* fixme: Add radio support */ |
1336 | .mpeg = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD, | 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 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 1359 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
1340 | 1360 | ||
@@ -1641,6 +1661,10 @@ struct cx88_subid cx88_subids[] = { | |||
1641 | .subvendor = 0x1421, | 1661 | .subvendor = 0x1421, |
1642 | .subdevice = 0x0341, /* ADS Tech InstantTV DVB-S */ | 1662 | .subdevice = 0x0341, /* ADS Tech InstantTV DVB-S */ |
1643 | .card = CX88_BOARD_KWORLD_DVBS_100, | 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 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); | 1670 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 250c29ab032d..d773b6e2544d 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -209,6 +209,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
209 | #define CX88_BOARD_NORWOOD_MICRO 54 | 209 | #define CX88_BOARD_NORWOOD_MICRO 54 |
210 | #define CX88_BOARD_TE_DTV_250_OEM_SWANN 55 | 210 | #define CX88_BOARD_TE_DTV_250_OEM_SWANN 55 |
211 | #define CX88_BOARD_HAUPPAUGE_HVR1300 56 | 211 | #define CX88_BOARD_HAUPPAUGE_HVR1300 56 |
212 | #define CX88_BOARD_ADSTECH_PTV_390 57 | ||
212 | 213 | ||
213 | enum cx88_itype { | 214 | enum cx88_itype { |
214 | CX88_VMUX_COMPOSITE1 = 1, | 215 | CX88_VMUX_COMPOSITE1 = 1, |