[PATCH] v4l: cx88 card support and documentation finishing touches

Peter Missel:
- Add support for the SVideo input on the GDI Black Gold.

Mauro Carvalho Chehab:
- Linux/version.h removed. Replaced by linux/utsname.h

Michael Krufky:
- Added analog support for DViCO FusionHDTV5 Gold.

CC: Peter Missel <peter.missel@onlinehome.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
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 9fef07ca fd3113e8

+31 -1
+1
Documentation/video4linux/CARDLIST.cx88
··· 29 29 card=28 - DViCO FusionHDTV 3 Gold-T 30 30 card=29 - ADS Tech Instant TV DVB-T PCI 31 31 card=30 - TerraTec Cinergy 1400 DVB-T 32 + card=31 - DViCO FusionHDTV 5 Gold
+28
drivers/media/video/cx88/cx88-cards.c
··· 499 499 .input = {{ 500 500 .type = CX88_VMUX_DVB, 501 501 .vmux = 0, 502 + },{ 503 + .type = CX88_VMUX_SVIDEO, 504 + .vmux = 2, 502 505 }}, 503 506 .dvb = 1, 504 507 }, ··· 759 756 }}, 760 757 .dvb = 1, 761 758 }, 759 + [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = { 760 + .name = "DViCO FusionHDTV 5 Gold", 761 + .tuner_type = TUNER_LG_TDVS_H062F, 762 + .radio_type = UNSET, 763 + .tuner_addr = ADDR_UNSET, 764 + .radio_addr = ADDR_UNSET, 765 + /* See DViCO FusionHDTV 3 Gold-Q for GPIO documentation. */ 766 + .input = {{ 767 + .type = CX88_VMUX_TELEVISION, 768 + .vmux = 0, 769 + .gpio0 = 0x0f0d, 770 + },{ 771 + .type = CX88_VMUX_COMPOSITE1, 772 + .vmux = 1, 773 + .gpio0 = 0x0f00, 774 + },{ 775 + .type = CX88_VMUX_SVIDEO, 776 + .vmux = 2, 777 + .gpio0 = 0x0f00, 778 + }}, 779 + }, 762 780 }; 763 781 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 764 782 ··· 907 883 .subvendor = 0x153b, 908 884 .subdevice = 0x1166, 909 885 .card = CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1, 886 + },{ 887 + .subvendor = 0x18ac, 888 + .subdevice = 0xd500, 889 + .card = CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD, 910 890 }, 911 891 }; 912 892 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
+2 -1
drivers/media/video/cx88/cx88.h
··· 1 1 /* 2 - * $Id: cx88.h,v 1.69 2005/07/13 17:25:25 mchehab Exp $ 2 + * $Id: cx88.h,v 1.70 2005/07/24 17:44:09 mkrufky Exp $ 3 3 * 4 4 * v4l2 device driver for cx2388x based TV cards 5 5 * ··· 171 171 #define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28 172 172 #define CX88_BOARD_ADSTECH_DVB_T_PCI 29 173 173 #define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1 30 174 + #define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31 174 175 175 176 enum cx88_itype { 176 177 CX88_VMUX_COMPOSITE1 = 1,