aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx88/cx88-cards.c31
-rw-r--r--drivers/media/video/cx88/cx88.h1
2 files changed, 32 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 367624822d77..98e40026aa4d 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -435,6 +435,33 @@ struct cx88_board cx88_boards[] = {
435 } 435 }
436#endif 436#endif
437 }, 437 },
438 [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = {
439 .name = "DViCO - FusionHDTV 3 Gold-Q",
440 .tuner_type = 52, /* Thomson DDT 7610 ATSC/NTSC - Its actually a 7611 chip, but this works */
441 .input = {{
442 .type = CX88_VMUX_TELEVISION,
443 .vmux = 0,
444 .gpio0 = 0x0f0d,
445 },{
446 .type = CX88_VMUX_CABLE,
447 .vmux = 0,
448 .gpio0 = 0x0f05,
449 },{
450 .type = CX88_VMUX_COMPOSITE1,
451 .vmux = 1,
452 .gpio0 = 0x0f00,
453 },{
454 .type = CX88_VMUX_SVIDEO,
455 .vmux = 2,
456 .gpio0 = 0x0f00,
457 }},
458#if 0
459 .ts = {
460 .type = CX88_TS,
461 .gpio0 = 0x00000f01, /* Hooked to tuner reset bit */
462 }
463#endif
464 },
438 [CX88_BOARD_HAUPPAUGE_DVB_T1] = { 465 [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
439 .name = "Hauppauge Nova-T DVB-T", 466 .name = "Hauppauge Nova-T DVB-T",
440 .tuner_type = TUNER_ABSENT, 467 .tuner_type = TUNER_ABSENT,
@@ -673,6 +700,10 @@ struct cx88_subid cx88_subids[] = {
673 .subdevice = 0xd810, 700 .subdevice = 0xd810,
674 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD, 701 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD,
675 },{ 702 },{
703 .subvendor = 0x18ac,
704 .subdevice = 0xd820,
705 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
706 },{
676 .subvendor = 0x18AC, 707 .subvendor = 0x18AC,
677 .subdevice = 0xDB00, 708 .subdevice = 0xDB00,
678 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1, 709 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1,
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 88eaaaba5ad8..0ea24b72d927 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -162,6 +162,7 @@ extern struct sram_channel cx88_sram_channels[];
162#define CX88_BOARD_HAUPPAUGE_ROSLYN 24 162#define CX88_BOARD_HAUPPAUGE_ROSLYN 24
163#define CX88_BOARD_DIGITALLOGIC_MEC 25 163#define CX88_BOARD_DIGITALLOGIC_MEC 25
164#define CX88_BOARD_IODATA_GVBCTV7E 26 164#define CX88_BOARD_IODATA_GVBCTV7E 26
165#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 27
165 166
166enum cx88_itype { 167enum cx88_itype {
167 CX88_VMUX_COMPOSITE1 = 1, 168 CX88_VMUX_COMPOSITE1 = 1,