diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-06-24 01:05:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:39 -0400 |
commit | b45009b0288a96a3458f4f8e93cb776678d41875 (patch) | |
tree | c912e8d3dcc625fe92cdd1bac97bab7539fce4d7 /drivers/media/video/cx88/cx88-cards.c | |
parent | 2d03e289ea4b13d78ce55f1ea0b0d45b8f1b34c3 (diff) |
[PATCH] v4l: CX88 cards update
This patch adds support for various CX88 cards and allows specifying
card addresses.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: cybercide@f2s.com <cybercide@f2s.com>
Signed-off-by: Catalin Climov <catalin@climov.com>
Signed-off-by: Nickolay V Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 235 |
1 files changed, 161 insertions, 74 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index a6763f1a44c1..b3fb04356b71 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: cx88-cards.c,v 1.66 2005/03/04 09:12:23 kraxel Exp $ | 2 | * $Id: cx88-cards.c,v 1.76 2005/06/08 01:28:09 mchehab Exp $ |
3 | * | 3 | * |
4 | * device driver for Conexant 2388x based TV cards | 4 | * device driver for Conexant 2388x based TV cards |
5 | * card-specific stuff. | 5 | * card-specific stuff. |
@@ -35,6 +35,9 @@ struct cx88_board cx88_boards[] = { | |||
35 | [CX88_BOARD_UNKNOWN] = { | 35 | [CX88_BOARD_UNKNOWN] = { |
36 | .name = "UNKNOWN/GENERIC", | 36 | .name = "UNKNOWN/GENERIC", |
37 | .tuner_type = UNSET, | 37 | .tuner_type = UNSET, |
38 | .radio_type = UNSET, | ||
39 | .tuner_addr = ADDR_UNSET, | ||
40 | .radio_addr = ADDR_UNSET, | ||
38 | .input = {{ | 41 | .input = {{ |
39 | .type = CX88_VMUX_COMPOSITE1, | 42 | .type = CX88_VMUX_COMPOSITE1, |
40 | .vmux = 0, | 43 | .vmux = 0, |
@@ -52,6 +55,9 @@ struct cx88_board cx88_boards[] = { | |||
52 | [CX88_BOARD_HAUPPAUGE] = { | 55 | [CX88_BOARD_HAUPPAUGE] = { |
53 | .name = "Hauppauge WinTV 34xxx models", | 56 | .name = "Hauppauge WinTV 34xxx models", |
54 | .tuner_type = UNSET, | 57 | .tuner_type = UNSET, |
58 | .radio_type = UNSET, | ||
59 | .tuner_addr = ADDR_UNSET, | ||
60 | .radio_addr = ADDR_UNSET, | ||
55 | .tda9887_conf = TDA9887_PRESENT, | 61 | .tda9887_conf = TDA9887_PRESENT, |
56 | .input = {{ | 62 | .input = {{ |
57 | .type = CX88_VMUX_TELEVISION, | 63 | .type = CX88_VMUX_TELEVISION, |
@@ -78,6 +84,9 @@ struct cx88_board cx88_boards[] = { | |||
78 | [CX88_BOARD_GDI] = { | 84 | [CX88_BOARD_GDI] = { |
79 | .name = "GDI Black Gold", | 85 | .name = "GDI Black Gold", |
80 | .tuner_type = UNSET, | 86 | .tuner_type = UNSET, |
87 | .radio_type = UNSET, | ||
88 | .tuner_addr = ADDR_UNSET, | ||
89 | .radio_addr = ADDR_UNSET, | ||
81 | .input = {{ | 90 | .input = {{ |
82 | .type = CX88_VMUX_TELEVISION, | 91 | .type = CX88_VMUX_TELEVISION, |
83 | .vmux = 0, | 92 | .vmux = 0, |
@@ -85,7 +94,10 @@ struct cx88_board cx88_boards[] = { | |||
85 | }, | 94 | }, |
86 | [CX88_BOARD_PIXELVIEW] = { | 95 | [CX88_BOARD_PIXELVIEW] = { |
87 | .name = "PixelView", | 96 | .name = "PixelView", |
88 | .tuner_type = 5, | 97 | .tuner_type = TUNER_PHILIPS_PAL, |
98 | .radio_type = UNSET, | ||
99 | .tuner_addr = ADDR_UNSET, | ||
100 | .radio_addr = ADDR_UNSET, | ||
89 | .input = {{ | 101 | .input = {{ |
90 | .type = CX88_VMUX_TELEVISION, | 102 | .type = CX88_VMUX_TELEVISION, |
91 | .vmux = 0, | 103 | .vmux = 0, |
@@ -104,7 +116,10 @@ struct cx88_board cx88_boards[] = { | |||
104 | }, | 116 | }, |
105 | [CX88_BOARD_ATI_WONDER_PRO] = { | 117 | [CX88_BOARD_ATI_WONDER_PRO] = { |
106 | .name = "ATI TV Wonder Pro", | 118 | .name = "ATI TV Wonder Pro", |
107 | .tuner_type = 44, | 119 | .tuner_type = TUNER_PHILIPS_4IN1, |
120 | .radio_type = UNSET, | ||
121 | .tuner_addr = ADDR_UNSET, | ||
122 | .radio_addr = ADDR_UNSET, | ||
108 | .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER, | 123 | .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER, |
109 | .input = {{ | 124 | .input = {{ |
110 | .type = CX88_VMUX_TELEVISION, | 125 | .type = CX88_VMUX_TELEVISION, |
@@ -122,7 +137,10 @@ struct cx88_board cx88_boards[] = { | |||
122 | }, | 137 | }, |
123 | [CX88_BOARD_WINFAST2000XP_EXPERT] = { | 138 | [CX88_BOARD_WINFAST2000XP_EXPERT] = { |
124 | .name = "Leadtek Winfast 2000XP Expert", | 139 | .name = "Leadtek Winfast 2000XP Expert", |
125 | .tuner_type = 44, | 140 | .tuner_type = TUNER_PHILIPS_4IN1, |
141 | .radio_type = UNSET, | ||
142 | .tuner_addr = ADDR_UNSET, | ||
143 | .radio_addr = ADDR_UNSET, | ||
126 | .tda9887_conf = TDA9887_PRESENT, | 144 | .tda9887_conf = TDA9887_PRESENT, |
127 | .input = {{ | 145 | .input = {{ |
128 | .type = CX88_VMUX_TELEVISION, | 146 | .type = CX88_VMUX_TELEVISION, |
@@ -156,7 +174,10 @@ struct cx88_board cx88_boards[] = { | |||
156 | }, | 174 | }, |
157 | [CX88_BOARD_AVERTV_303] = { | 175 | [CX88_BOARD_AVERTV_303] = { |
158 | .name = "AverTV Studio 303 (M126)", | 176 | .name = "AverTV Studio 303 (M126)", |
159 | .tuner_type = 38, | 177 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
178 | .radio_type = UNSET, | ||
179 | .tuner_addr = ADDR_UNSET, | ||
180 | .radio_addr = ADDR_UNSET, | ||
160 | .tda9887_conf = TDA9887_PRESENT, | 181 | .tda9887_conf = TDA9887_PRESENT, |
161 | .input = {{ | 182 | .input = {{ |
162 | .type = CX88_VMUX_TELEVISION, | 183 | .type = CX88_VMUX_TELEVISION, |
@@ -179,7 +200,10 @@ struct cx88_board cx88_boards[] = { | |||
179 | // added gpio values thanks to Michal | 200 | // added gpio values thanks to Michal |
180 | // values for PAL from DScaler | 201 | // values for PAL from DScaler |
181 | .name = "MSI TV-@nywhere Master", | 202 | .name = "MSI TV-@nywhere Master", |
182 | .tuner_type = 33, | 203 | .tuner_type = TUNER_MT2032, |
204 | .radio_type = UNSET, | ||
205 | .tuner_addr = ADDR_UNSET, | ||
206 | .radio_addr = ADDR_UNSET, | ||
183 | .tda9887_conf = TDA9887_PRESENT, | 207 | .tda9887_conf = TDA9887_PRESENT, |
184 | .input = {{ | 208 | .input = {{ |
185 | .type = CX88_VMUX_TELEVISION, | 209 | .type = CX88_VMUX_TELEVISION, |
@@ -206,7 +230,10 @@ struct cx88_board cx88_boards[] = { | |||
206 | }, | 230 | }, |
207 | [CX88_BOARD_WINFAST_DV2000] = { | 231 | [CX88_BOARD_WINFAST_DV2000] = { |
208 | .name = "Leadtek Winfast DV2000", | 232 | .name = "Leadtek Winfast DV2000", |
209 | .tuner_type = 38, | 233 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
234 | .radio_type = UNSET, | ||
235 | .tuner_addr = ADDR_UNSET, | ||
236 | .radio_addr = ADDR_UNSET, | ||
210 | .tda9887_conf = TDA9887_PRESENT, | 237 | .tda9887_conf = TDA9887_PRESENT, |
211 | .input = {{ | 238 | .input = {{ |
212 | .type = CX88_VMUX_TELEVISION, | 239 | .type = CX88_VMUX_TELEVISION, |
@@ -239,34 +266,40 @@ struct cx88_board cx88_boards[] = { | |||
239 | .gpio3 = 0x02000000, | 266 | .gpio3 = 0x02000000, |
240 | }, | 267 | }, |
241 | }, | 268 | }, |
242 | [CX88_BOARD_LEADTEK_PVR2000] = { | 269 | [CX88_BOARD_LEADTEK_PVR2000] = { |
243 | // gpio values for PAL version from regspy by DScaler | 270 | // gpio values for PAL version from regspy by DScaler |
244 | .name = "Leadtek PVR 2000", | 271 | .name = "Leadtek PVR 2000", |
245 | .tuner_type = 38, | 272 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
273 | .radio_type = UNSET, | ||
274 | .tuner_addr = ADDR_UNSET, | ||
275 | .radio_addr = ADDR_UNSET, | ||
246 | .tda9887_conf = TDA9887_PRESENT, | 276 | .tda9887_conf = TDA9887_PRESENT, |
247 | .input = {{ | 277 | .input = {{ |
248 | .type = CX88_VMUX_TELEVISION, | 278 | .type = CX88_VMUX_TELEVISION, |
249 | .vmux = 0, | 279 | .vmux = 0, |
250 | .gpio0 = 0x0000bde6, | 280 | .gpio0 = 0x0000bde2, |
251 | },{ | 281 | },{ |
252 | .type = CX88_VMUX_COMPOSITE1, | 282 | .type = CX88_VMUX_COMPOSITE1, |
253 | .vmux = 1, | 283 | .vmux = 1, |
254 | .gpio0 = 0x0000bde6, | 284 | .gpio0 = 0x0000bde6, |
255 | },{ | 285 | },{ |
256 | .type = CX88_VMUX_SVIDEO, | 286 | .type = CX88_VMUX_SVIDEO, |
257 | .vmux = 2, | 287 | .vmux = 2, |
258 | .gpio0 = 0x0000bde6, | 288 | .gpio0 = 0x0000bde6, |
259 | }}, | 289 | }}, |
260 | .radio = { | 290 | .radio = { |
261 | .type = CX88_RADIO, | 291 | .type = CX88_RADIO, |
262 | .gpio0 = 0x0000bd62, | 292 | .gpio0 = 0x0000bd62, |
263 | }, | 293 | }, |
264 | .blackbird = 1, | 294 | .blackbird = 1, |
265 | }, | 295 | }, |
266 | [CX88_BOARD_IODATA_GVVCP3PCI] = { | 296 | [CX88_BOARD_IODATA_GVVCP3PCI] = { |
267 | .name = "IODATA GV-VCP3/PCI", | 297 | .name = "IODATA GV-VCP3/PCI", |
268 | .tuner_type = TUNER_ABSENT, | 298 | .tuner_type = TUNER_ABSENT, |
269 | .input = {{ | 299 | .radio_type = UNSET, |
300 | .tuner_addr = ADDR_UNSET, | ||
301 | .radio_addr = ADDR_UNSET, | ||
302 | .input = {{ | ||
270 | .type = CX88_VMUX_COMPOSITE1, | 303 | .type = CX88_VMUX_COMPOSITE1, |
271 | .vmux = 0, | 304 | .vmux = 0, |
272 | },{ | 305 | },{ |
@@ -279,7 +312,10 @@ struct cx88_board cx88_boards[] = { | |||
279 | }, | 312 | }, |
280 | [CX88_BOARD_PROLINK_PLAYTVPVR] = { | 313 | [CX88_BOARD_PROLINK_PLAYTVPVR] = { |
281 | .name = "Prolink PlayTV PVR", | 314 | .name = "Prolink PlayTV PVR", |
282 | .tuner_type = 43, | 315 | .tuner_type = TUNER_PHILIPS_FM1236_MK3, |
316 | .radio_type = UNSET, | ||
317 | .tuner_addr = ADDR_UNSET, | ||
318 | .radio_addr = ADDR_UNSET, | ||
283 | .tda9887_conf = TDA9887_PRESENT, | 319 | .tda9887_conf = TDA9887_PRESENT, |
284 | .input = {{ | 320 | .input = {{ |
285 | .type = CX88_VMUX_TELEVISION, | 321 | .type = CX88_VMUX_TELEVISION, |
@@ -301,8 +337,11 @@ struct cx88_board cx88_boards[] = { | |||
301 | }, | 337 | }, |
302 | [CX88_BOARD_ASUS_PVR_416] = { | 338 | [CX88_BOARD_ASUS_PVR_416] = { |
303 | .name = "ASUS PVR-416", | 339 | .name = "ASUS PVR-416", |
304 | .tuner_type = 43, | 340 | .tuner_type = TUNER_PHILIPS_FM1236_MK3, |
305 | .tda9887_conf = TDA9887_PRESENT, | 341 | .radio_type = UNSET, |
342 | .tuner_addr = ADDR_UNSET, | ||
343 | .radio_addr = ADDR_UNSET, | ||
344 | .tda9887_conf = TDA9887_PRESENT, | ||
306 | .input = {{ | 345 | .input = {{ |
307 | .type = CX88_VMUX_TELEVISION, | 346 | .type = CX88_VMUX_TELEVISION, |
308 | .vmux = 0, | 347 | .vmux = 0, |
@@ -320,7 +359,10 @@ struct cx88_board cx88_boards[] = { | |||
320 | }, | 359 | }, |
321 | [CX88_BOARD_MSI_TVANYWHERE] = { | 360 | [CX88_BOARD_MSI_TVANYWHERE] = { |
322 | .name = "MSI TV-@nywhere", | 361 | .name = "MSI TV-@nywhere", |
323 | .tuner_type = 33, | 362 | .tuner_type = TUNER_MT2032, |
363 | .radio_type = UNSET, | ||
364 | .tuner_addr = ADDR_UNSET, | ||
365 | .radio_addr = ADDR_UNSET, | ||
324 | .tda9887_conf = TDA9887_PRESENT, | 366 | .tda9887_conf = TDA9887_PRESENT, |
325 | .input = {{ | 367 | .input = {{ |
326 | .type = CX88_VMUX_TELEVISION, | 368 | .type = CX88_VMUX_TELEVISION, |
@@ -342,6 +384,9 @@ struct cx88_board cx88_boards[] = { | |||
342 | [CX88_BOARD_KWORLD_DVB_T] = { | 384 | [CX88_BOARD_KWORLD_DVB_T] = { |
343 | .name = "KWorld/VStream XPert DVB-T", | 385 | .name = "KWorld/VStream XPert DVB-T", |
344 | .tuner_type = TUNER_ABSENT, | 386 | .tuner_type = TUNER_ABSENT, |
387 | .radio_type = UNSET, | ||
388 | .tuner_addr = ADDR_UNSET, | ||
389 | .radio_addr = ADDR_UNSET, | ||
345 | .input = {{ | 390 | .input = {{ |
346 | .type = CX88_VMUX_COMPOSITE1, | 391 | .type = CX88_VMUX_COMPOSITE1, |
347 | .vmux = 1, | 392 | .vmux = 1, |
@@ -358,6 +403,9 @@ struct cx88_board cx88_boards[] = { | |||
358 | [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = { | 403 | [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = { |
359 | .name = "DVICO FusionHDTV DVB-T1", | 404 | .name = "DVICO FusionHDTV DVB-T1", |
360 | .tuner_type = TUNER_ABSENT, /* No analog tuner */ | 405 | .tuner_type = TUNER_ABSENT, /* No analog tuner */ |
406 | .radio_type = UNSET, | ||
407 | .tuner_addr = ADDR_UNSET, | ||
408 | .radio_addr = ADDR_UNSET, | ||
361 | .input = {{ | 409 | .input = {{ |
362 | .type = CX88_VMUX_COMPOSITE1, | 410 | .type = CX88_VMUX_COMPOSITE1, |
363 | .vmux = 1, | 411 | .vmux = 1, |
@@ -371,7 +419,10 @@ struct cx88_board cx88_boards[] = { | |||
371 | }, | 419 | }, |
372 | [CX88_BOARD_KWORLD_LTV883] = { | 420 | [CX88_BOARD_KWORLD_LTV883] = { |
373 | .name = "KWorld LTV883RF", | 421 | .name = "KWorld LTV883RF", |
374 | .tuner_type = 48, | 422 | .tuner_type = TUNER_TNF_8831BGFF, |
423 | .radio_type = UNSET, | ||
424 | .tuner_addr = ADDR_UNSET, | ||
425 | .radio_addr = ADDR_UNSET, | ||
375 | .input = {{ | 426 | .input = {{ |
376 | .type = CX88_VMUX_TELEVISION, | 427 | .type = CX88_VMUX_TELEVISION, |
377 | .vmux = 0, | 428 | .vmux = 0, |
@@ -397,6 +448,9 @@ struct cx88_board cx88_boards[] = { | |||
397 | [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD] = { | 448 | [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD] = { |
398 | .name = "DViCO - FusionHDTV 3 Gold", | 449 | .name = "DViCO - FusionHDTV 3 Gold", |
399 | .tuner_type = TUNER_MICROTUNE_4042FI5, | 450 | .tuner_type = TUNER_MICROTUNE_4042FI5, |
451 | .radio_type = UNSET, | ||
452 | .tuner_addr = ADDR_UNSET, | ||
453 | .radio_addr = ADDR_UNSET, | ||
400 | /* | 454 | /* |
401 | GPIO[0] resets DT3302 DTV receiver | 455 | GPIO[0] resets DT3302 DTV receiver |
402 | 0 - reset asserted | 456 | 0 - reset asserted |
@@ -429,32 +483,13 @@ struct cx88_board cx88_boards[] = { | |||
429 | .gpio0 = 0x0f00, | 483 | .gpio0 = 0x0f00, |
430 | }}, | 484 | }}, |
431 | }, | 485 | }, |
432 | [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = { | ||
433 | .name = "DViCO - FusionHDTV 3 Gold-T", | ||
434 | .tuner_type = 60, /* Thomson DDT 7611 ATSC/NTSC */ | ||
435 | /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */ | ||
436 | .input = {{ | ||
437 | .type = CX88_VMUX_TELEVISION, | ||
438 | .vmux = 0, | ||
439 | .gpio0 = 0x0f0d, | ||
440 | },{ | ||
441 | .type = CX88_VMUX_CABLE, | ||
442 | .vmux = 0, | ||
443 | .gpio0 = 0x0f05, | ||
444 | },{ | ||
445 | .type = CX88_VMUX_COMPOSITE1, | ||
446 | .vmux = 1, | ||
447 | .gpio0 = 0x0f00, | ||
448 | },{ | ||
449 | .type = CX88_VMUX_SVIDEO, | ||
450 | .vmux = 2, | ||
451 | .gpio0 = 0x0f00, | ||
452 | }}, | ||
453 | }, | ||
454 | [CX88_BOARD_HAUPPAUGE_DVB_T1] = { | 486 | [CX88_BOARD_HAUPPAUGE_DVB_T1] = { |
455 | .name = "Hauppauge Nova-T DVB-T", | 487 | .name = "Hauppauge Nova-T DVB-T", |
456 | .tuner_type = TUNER_ABSENT, | 488 | .tuner_type = TUNER_ABSENT, |
457 | .input = {{ | 489 | .radio_type = UNSET, |
490 | .tuner_addr = ADDR_UNSET, | ||
491 | .radio_addr = ADDR_UNSET, | ||
492 | .input = {{ | ||
458 | .type = CX88_VMUX_DVB, | 493 | .type = CX88_VMUX_DVB, |
459 | .vmux = 0, | 494 | .vmux = 0, |
460 | }}, | 495 | }}, |
@@ -463,6 +498,9 @@ struct cx88_board cx88_boards[] = { | |||
463 | [CX88_BOARD_CONEXANT_DVB_T1] = { | 498 | [CX88_BOARD_CONEXANT_DVB_T1] = { |
464 | .name = "Conexant DVB-T reference design", | 499 | .name = "Conexant DVB-T reference design", |
465 | .tuner_type = TUNER_ABSENT, | 500 | .tuner_type = TUNER_ABSENT, |
501 | .radio_type = UNSET, | ||
502 | .tuner_addr = ADDR_UNSET, | ||
503 | .radio_addr = ADDR_UNSET, | ||
466 | .input = {{ | 504 | .input = {{ |
467 | .type = CX88_VMUX_DVB, | 505 | .type = CX88_VMUX_DVB, |
468 | .vmux = 0, | 506 | .vmux = 0, |
@@ -472,6 +510,9 @@ struct cx88_board cx88_boards[] = { | |||
472 | [CX88_BOARD_PROVIDEO_PV259] = { | 510 | [CX88_BOARD_PROVIDEO_PV259] = { |
473 | .name = "Provideo PV259", | 511 | .name = "Provideo PV259", |
474 | .tuner_type = TUNER_PHILIPS_FQ1216ME, | 512 | .tuner_type = TUNER_PHILIPS_FQ1216ME, |
513 | .radio_type = UNSET, | ||
514 | .tuner_addr = ADDR_UNSET, | ||
515 | .radio_addr = ADDR_UNSET, | ||
475 | .input = {{ | 516 | .input = {{ |
476 | .type = CX88_VMUX_TELEVISION, | 517 | .type = CX88_VMUX_TELEVISION, |
477 | .vmux = 0, | 518 | .vmux = 0, |
@@ -481,6 +522,9 @@ struct cx88_board cx88_boards[] = { | |||
481 | [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = { | 522 | [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = { |
482 | .name = "DVICO FusionHDTV DVB-T Plus", | 523 | .name = "DVICO FusionHDTV DVB-T Plus", |
483 | .tuner_type = TUNER_ABSENT, /* No analog tuner */ | 524 | .tuner_type = TUNER_ABSENT, /* No analog tuner */ |
525 | .radio_type = UNSET, | ||
526 | .tuner_addr = ADDR_UNSET, | ||
527 | .radio_addr = ADDR_UNSET, | ||
484 | .input = {{ | 528 | .input = {{ |
485 | .type = CX88_VMUX_COMPOSITE1, | 529 | .type = CX88_VMUX_COMPOSITE1, |
486 | .vmux = 1, | 530 | .vmux = 1, |
@@ -495,6 +539,9 @@ struct cx88_board cx88_boards[] = { | |||
495 | [CX88_BOARD_DNTV_LIVE_DVB_T] = { | 539 | [CX88_BOARD_DNTV_LIVE_DVB_T] = { |
496 | .name = "digitalnow DNTV Live! DVB-T", | 540 | .name = "digitalnow DNTV Live! DVB-T", |
497 | .tuner_type = TUNER_ABSENT, | 541 | .tuner_type = TUNER_ABSENT, |
542 | .radio_type = UNSET, | ||
543 | .tuner_addr = ADDR_UNSET, | ||
544 | .radio_addr = ADDR_UNSET, | ||
498 | .input = {{ | 545 | .input = {{ |
499 | .type = CX88_VMUX_COMPOSITE1, | 546 | .type = CX88_VMUX_COMPOSITE1, |
500 | .vmux = 1, | 547 | .vmux = 1, |
@@ -511,6 +558,9 @@ struct cx88_board cx88_boards[] = { | |||
511 | [CX88_BOARD_PCHDTV_HD3000] = { | 558 | [CX88_BOARD_PCHDTV_HD3000] = { |
512 | .name = "pcHDTV HD3000 HDTV", | 559 | .name = "pcHDTV HD3000 HDTV", |
513 | .tuner_type = TUNER_THOMSON_DTT7610, | 560 | .tuner_type = TUNER_THOMSON_DTT7610, |
561 | .radio_type = UNSET, | ||
562 | .tuner_addr = ADDR_UNSET, | ||
563 | .radio_addr = ADDR_UNSET, | ||
514 | .input = {{ | 564 | .input = {{ |
515 | .type = CX88_VMUX_TELEVISION, | 565 | .type = CX88_VMUX_TELEVISION, |
516 | .vmux = 0, | 566 | .vmux = 0, |
@@ -546,8 +596,11 @@ struct cx88_board cx88_boards[] = { | |||
546 | [CX88_BOARD_HAUPPAUGE_ROSLYN] = { | 596 | [CX88_BOARD_HAUPPAUGE_ROSLYN] = { |
547 | // entry added by Kaustubh D. Bhalerao <bhalerao.1@osu.edu> | 597 | // entry added by Kaustubh D. Bhalerao <bhalerao.1@osu.edu> |
548 | // GPIO values obtained from regspy, courtesy Sean Covel | 598 | // GPIO values obtained from regspy, courtesy Sean Covel |
549 | .name = "Hauppauge WinTV 28xxx (Roslyn) models", | 599 | .name = "Hauppauge WinTV 28xxx (Roslyn) models", |
550 | .tuner_type = UNSET, | 600 | .tuner_type = UNSET, |
601 | .radio_type = UNSET, | ||
602 | .tuner_addr = ADDR_UNSET, | ||
603 | .radio_addr = ADDR_UNSET, | ||
551 | .input = {{ | 604 | .input = {{ |
552 | .type = CX88_VMUX_TELEVISION, | 605 | .type = CX88_VMUX_TELEVISION, |
553 | .vmux = 0, | 606 | .vmux = 0, |
@@ -575,33 +628,37 @@ struct cx88_board cx88_boards[] = { | |||
575 | .blackbird = 1, | 628 | .blackbird = 1, |
576 | }, | 629 | }, |
577 | [CX88_BOARD_DIGITALLOGIC_MEC] = { | 630 | [CX88_BOARD_DIGITALLOGIC_MEC] = { |
578 | /* params copied over from Leadtek PVR 2000 */ | ||
579 | .name = "Digital-Logic MICROSPACE Entertainment Center (MEC)", | 631 | .name = "Digital-Logic MICROSPACE Entertainment Center (MEC)", |
580 | /* not sure yet about the tuner type */ | 632 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
581 | .tuner_type = 38, | 633 | .radio_type = UNSET, |
634 | .tuner_addr = ADDR_UNSET, | ||
635 | .radio_addr = ADDR_UNSET, | ||
582 | .tda9887_conf = TDA9887_PRESENT, | 636 | .tda9887_conf = TDA9887_PRESENT, |
583 | .input = {{ | 637 | .input = {{ |
584 | .type = CX88_VMUX_TELEVISION, | 638 | .type = CX88_VMUX_TELEVISION, |
585 | .vmux = 0, | 639 | .vmux = 0, |
586 | .gpio0 = 0x0000bde6, | 640 | .gpio0 = 0x00009d80, |
587 | },{ | 641 | },{ |
588 | .type = CX88_VMUX_COMPOSITE1, | 642 | .type = CX88_VMUX_COMPOSITE1, |
589 | .vmux = 1, | 643 | .vmux = 1, |
590 | .gpio0 = 0x0000bde6, | 644 | .gpio0 = 0x00009d76, |
591 | },{ | 645 | },{ |
592 | .type = CX88_VMUX_SVIDEO, | 646 | .type = CX88_VMUX_SVIDEO, |
593 | .vmux = 2, | 647 | .vmux = 2, |
594 | .gpio0 = 0x0000bde6, | 648 | .gpio0 = 0x00009d76, |
595 | }}, | 649 | }}, |
596 | .radio = { | 650 | .radio = { |
597 | .type = CX88_RADIO, | 651 | .type = CX88_RADIO, |
598 | .gpio0 = 0x0000bd62, | 652 | .gpio0 = 0x00009d00, |
599 | }, | 653 | }, |
600 | .blackbird = 1, | 654 | .blackbird = 1, |
601 | }, | 655 | }, |
602 | [CX88_BOARD_IODATA_GVBCTV7E] = { | 656 | [CX88_BOARD_IODATA_GVBCTV7E] = { |
603 | .name = "IODATA GV/BCTV7E", | 657 | .name = "IODATA GV/BCTV7E", |
604 | .tuner_type = TUNER_PHILIPS_FQ1286, | 658 | .tuner_type = TUNER_PHILIPS_FQ1286, |
659 | .radio_type = UNSET, | ||
660 | .tuner_addr = ADDR_UNSET, | ||
661 | .radio_addr = ADDR_UNSET, | ||
605 | .tda9887_conf = TDA9887_PRESENT, | 662 | .tda9887_conf = TDA9887_PRESENT, |
606 | .input = {{ | 663 | .input = {{ |
607 | .type = CX88_VMUX_TELEVISION, | 664 | .type = CX88_VMUX_TELEVISION, |
@@ -619,25 +676,54 @@ struct cx88_board cx88_boards[] = { | |||
619 | }, | 676 | }, |
620 | [CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO] = { | 677 | [CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO] = { |
621 | .name = "PixelView PlayTV Ultra Pro (Stereo)", | 678 | .name = "PixelView PlayTV Ultra Pro (Stereo)", |
622 | .tuner_type = 38, | 679 | /* May be also TUNER_YMEC_TVF_5533MF for NTSC/M or PAL/M */ |
680 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
681 | .radio_type = TUNER_TEA5767, | ||
682 | .tuner_addr = 0xc2>>1, | ||
683 | .radio_addr = 0xc0>>1, | ||
623 | .input = {{ | 684 | .input = {{ |
624 | .type = CX88_VMUX_TELEVISION, | 685 | .type = CX88_VMUX_TELEVISION, |
625 | .vmux = 0, | 686 | .vmux = 0, |
626 | .gpio0 = 0xbf61, // internal decoder | 687 | .gpio0 = 0xbf61, /* internal decoder */ |
627 | },{ | 688 | },{ |
628 | .type = CX88_VMUX_COMPOSITE1, | 689 | .type = CX88_VMUX_COMPOSITE1, |
629 | .vmux = 1, | 690 | .vmux = 1, |
630 | .gpio0 = 0xbf63, | 691 | .gpio0 = 0xbf63, |
631 | },{ | 692 | },{ |
632 | .type = CX88_VMUX_SVIDEO, | 693 | .type = CX88_VMUX_SVIDEO, |
633 | .vmux = 2, | 694 | .vmux = 2, |
634 | .gpio0 = 0xbf63, | 695 | .gpio0 = 0xbf63, |
635 | }}, | 696 | }}, |
636 | .radio = { | 697 | .radio = { |
637 | .type = CX88_RADIO, | 698 | .type = CX88_RADIO, |
638 | .gpio0 = 0xbf60, | 699 | .gpio0 = 0xbf60, |
639 | }, | 700 | }, |
640 | }, | 701 | }, |
702 | [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = { | ||
703 | .name = "DViCO - FusionHDTV 3 Gold-T", | ||
704 | .tuner_type = TUNER_THOMSON_DTT7611, | ||
705 | .radio_type = UNSET, | ||
706 | .tuner_addr = ADDR_UNSET, | ||
707 | .radio_addr = ADDR_UNSET, | ||
708 | /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */ | ||
709 | .input = {{ | ||
710 | .type = CX88_VMUX_TELEVISION, | ||
711 | .vmux = 0, | ||
712 | .gpio0 = 0x0f0d, | ||
713 | },{ | ||
714 | .type = CX88_VMUX_CABLE, | ||
715 | .vmux = 0, | ||
716 | .gpio0 = 0x0f05, | ||
717 | },{ | ||
718 | .type = CX88_VMUX_COMPOSITE1, | ||
719 | .vmux = 1, | ||
720 | .gpio0 = 0x0f00, | ||
721 | },{ | ||
722 | .type = CX88_VMUX_SVIDEO, | ||
723 | .vmux = 2, | ||
724 | .gpio0 = 0x0f00, | ||
725 | }}, | ||
726 | }, | ||
641 | }; | 727 | }; |
642 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 728 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
643 | 729 | ||
@@ -976,4 +1062,5 @@ EXPORT_SYMBOL(cx88_card_setup); | |||
976 | * Local variables: | 1062 | * Local variables: |
977 | * c-basic-offset: 8 | 1063 | * c-basic-offset: 8 |
978 | * End: | 1064 | * End: |
1065 | * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off | ||
979 | */ | 1066 | */ |