diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-06-28 11:19:20 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:26 -0400 |
| commit | 27cb786f4ec5fe85e9e2deffa4d33eed2f588cb0 (patch) | |
| tree | f50ca25720f5d08dc28bd315b2cf9402fe5aec29 | |
| parent | c350f617ff5440dedea63b9d7826644742ec215d (diff) | |
V4L/DVB (5803): Bttv: add support for DViCO FusionHDTV 2
add analog video support for DViCO FusionHDTV 2
Thanks to Todd Ignasiak for donating the card.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 1 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 19 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index e04acc619e56..177159c5f4c4 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv | |||
| @@ -146,3 +146,4 @@ | |||
| 146 | 145 -> SSAI Security Video Interface [4149:5353] | 146 | 145 -> SSAI Security Video Interface [4149:5353] |
| 147 | 146 -> SSAI Ultrasound Video Interface [414a:5353] | 147 | 146 -> SSAI Ultrasound Video Interface [414a:5353] |
| 148 | 147 -> VoodooTV 200 (USA) [121a:3000] | 148 | 147 -> VoodooTV 200 (USA) [121a:3000] |
| 149 | 148 -> DViCO FusionHDTV 2 [dbc0:d200] | ||
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index a5e02005cdae..2d61ed6fb0b5 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
| @@ -313,6 +313,7 @@ static struct CARD { | |||
| 313 | { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE, "Ultraview DVB-T Lite" }, | 313 | { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE, "Ultraview DVB-T Lite" }, |
| 314 | { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE, "DViCO FusionHDTV 5 Lite" }, | 314 | { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE, "DViCO FusionHDTV 5 Lite" }, |
| 315 | { 0x00261822, BTTV_BOARD_TWINHAN_DST, "DNTV Live! Mini "}, | 315 | { 0x00261822, BTTV_BOARD_TWINHAN_DST, "DNTV Live! Mini "}, |
| 316 | { 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2, "DViCO FusionHDTV 2" }, | ||
| 316 | 317 | ||
| 317 | { 0, -1, NULL } | 318 | { 0, -1, NULL } |
| 318 | }; | 319 | }; |
| @@ -2954,6 +2955,24 @@ struct tvcard bttv_tvcards[] = { | |||
| 2954 | .tuner_addr = ADDR_UNSET, | 2955 | .tuner_addr = ADDR_UNSET, |
| 2955 | .radio_addr = ADDR_UNSET, | 2956 | .radio_addr = ADDR_UNSET, |
| 2956 | }, | 2957 | }, |
| 2958 | /* ---- card 0x94---------------------------------- */ | ||
| 2959 | [BTTV_BOARD_DVICO_FUSIONHDTV_2] = { | ||
| 2960 | .name = "DViCO FusionHDTV 2", | ||
| 2961 | .tuner = 0, | ||
| 2962 | .tuner_type = TUNER_PHILIPS_ATSC, /* FCV1236D */ | ||
| 2963 | .tuner_addr = ADDR_UNSET, | ||
| 2964 | .radio_addr = ADDR_UNSET, | ||
| 2965 | .video_inputs = 3, | ||
| 2966 | .audio_inputs = 1, | ||
| 2967 | .svhs = 2, | ||
| 2968 | .muxsel = { 2, 3, 1 }, | ||
| 2969 | .gpiomask = 0x00e00007, | ||
| 2970 | .gpiomux = { 0x00400005, 0, 0x00000001, 0 }, | ||
| 2971 | .gpiomute = 0x00c00007, | ||
| 2972 | .no_msp34xx = 1, | ||
| 2973 | .no_tda9875 = 1, | ||
| 2974 | .no_tda7432 = 1, | ||
| 2975 | }, | ||
| 2957 | }; | 2976 | }; |
| 2958 | 2977 | ||
| 2959 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); | 2978 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 0b4e9f03d0ed..dcc847dc2486 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
| @@ -171,6 +171,7 @@ | |||
| 171 | #define BTTV_BOARD_SSAI_SECURITY 0x91 | 171 | #define BTTV_BOARD_SSAI_SECURITY 0x91 |
| 172 | #define BTTV_BOARD_SSAI_ULTRASOUND 0x92 | 172 | #define BTTV_BOARD_SSAI_ULTRASOUND 0x92 |
| 173 | #define BTTV_BOARD_VOODOOTV_200 0x93 | 173 | #define BTTV_BOARD_VOODOOTV_200 0x93 |
| 174 | #define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94 | ||
| 174 | 175 | ||
| 175 | /* more card-specific defines */ | 176 | /* more card-specific defines */ |
| 176 | #define PT2254_L_CHANNEL 0x10 | 177 | #define PT2254_L_CHANNEL 0x10 |
