[PATCH] Fix for cx88-cards.c for DVICO-FusionHDTV 3 GOLD Q

This patch allows full analog functionality for the DViCO FusionHDTV3
Gold-Q, 18ac:d820 which has a Conexant cx23882, Thompson7611, and LG 3202.
It does NOT yet support digital decoding or digital audio without the
internal analog audio jack connected to the sound board, but it works
perfectly in analog mode.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Michael Krufky and committed by
Linus Torvalds
097b750e d6988588

+32
+31
drivers/media/video/cx88/cx88-cards.c
··· 435 } 436 #endif 437 }, 438 [CX88_BOARD_HAUPPAUGE_DVB_T1] = { 439 .name = "Hauppauge Nova-T DVB-T", 440 .tuner_type = TUNER_ABSENT, ··· 699 .subvendor = 0x18ac, 700 .subdevice = 0xd810, 701 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD, 702 },{ 703 .subvendor = 0x18AC, 704 .subdevice = 0xDB00,
··· 435 } 436 #endif 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 + }, 465 [CX88_BOARD_HAUPPAUGE_DVB_T1] = { 466 .name = "Hauppauge Nova-T DVB-T", 467 .tuner_type = TUNER_ABSENT, ··· 672 .subvendor = 0x18ac, 673 .subdevice = 0xd810, 674 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD, 675 + },{ 676 + .subvendor = 0x18ac, 677 + .subdevice = 0xd820, 678 + .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, 679 },{ 680 .subvendor = 0x18AC, 681 .subdevice = 0xDB00,
+1
drivers/media/video/cx88/cx88.h
··· 162 #define CX88_BOARD_HAUPPAUGE_ROSLYN 24 163 #define CX88_BOARD_DIGITALLOGIC_MEC 25 164 #define CX88_BOARD_IODATA_GVBCTV7E 26 165 166 enum cx88_itype { 167 CX88_VMUX_COMPOSITE1 = 1,
··· 162 #define CX88_BOARD_HAUPPAUGE_ROSLYN 24 163 #define CX88_BOARD_DIGITALLOGIC_MEC 25 164 #define CX88_BOARD_IODATA_GVBCTV7E 26 165 + #define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 27 166 167 enum cx88_itype { 168 CX88_VMUX_COMPOSITE1 = 1,