Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] saa7134: add AverMedia AverTV/505 card support

Add AverMedia AverTV/505 card to saa7134 driver. It is a card bearing
SAA7130HL chip and FQ1216ME/IH-3 tuner.

Working: Composite, TV and IR remote control.
Untested: S-Video.

[mchehab@osg.samsung.com: fix CodingStyle]
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Dmitry Eremin-Solenikov and committed by
Mauro Carvalho Chehab
de983454 4b7574fb

+45 -1
+1
Documentation/video4linux/CARDLIST.saa7134
··· 192 192 191 -> Hawell HW-9004V1 193 193 192 -> AverMedia AverTV Satellite Hybrid+FM A706 [1461:2055] 194 194 193 -> WIS Voyager or compatible [1905:7007] 195 + 194 -> AverMedia AverTV/505 [1461:a10a]
+41 -1
drivers/media/pci/saa7134/saa7134-cards.c
··· 5851 5851 .amux = LINE1, 5852 5852 } }, 5853 5853 }, 5854 + [SAA7134_BOARD_AVERMEDIA_505] = { 5855 + /* much like the "studio" version but without radio 5856 + * and another tuner (dbaryshkov@gmail.com) */ 5857 + .name = "AverMedia AverTV/505", 5858 + .audio_clock = 0x00187de7, 5859 + .tuner_type = TUNER_PHILIPS_FQ1216ME, 5860 + .radio_type = UNSET, 5861 + .tuner_addr = ADDR_UNSET, 5862 + .radio_addr = ADDR_UNSET, 5863 + .tda9887_conf = TDA9887_PRESENT, 5864 + .inputs = {{ 5865 + .name = name_tv, 5866 + .vmux = 1, 5867 + .amux = LINE2, 5868 + .tv = 1, 5869 + }, { 5870 + .name = name_comp1, 5871 + .vmux = 0, 5872 + .amux = LINE2, 5873 + }, { 5874 + .name = name_comp2, 5875 + .vmux = 3, 5876 + .amux = LINE2, 5877 + }, { 5878 + .name = name_svideo, 5879 + .vmux = 8, 5880 + .amux = LINE2, 5881 + } }, 5882 + .mute = { 5883 + .name = name_mute, 5884 + .amux = LINE1, 5885 + }, 5886 + }, 5854 5887 5855 5888 }; 5856 5889 ··· 7143 7110 .subdevice = 0x7007, 7144 7111 .driver_data = SAA7134_BOARD_WIS_VOYAGER, 7145 7112 }, { 7113 + .vendor = PCI_VENDOR_ID_PHILIPS, 7114 + .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 7115 + .subvendor = 0x1461, /* Avermedia Technologies Inc */ 7116 + .subdevice = 0xa10a, 7117 + .driver_data = SAA7134_BOARD_AVERMEDIA_505, 7118 + }, { 7146 7119 /* --- boards without eeprom + subsystem ID --- */ 7147 7120 .vendor = PCI_VENDOR_ID_PHILIPS, 7148 7121 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, ··· 7488 7449 case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: 7489 7450 case SAA7134_BOARD_KWORLD_XPERT: 7490 7451 case SAA7134_BOARD_AVERMEDIA_STUDIO_305: 7491 - case SAA7134_BOARD_AVERMEDIA_STUDIO_505: 7492 7452 case SAA7134_BOARD_AVERMEDIA_305: 7453 + case SAA7134_BOARD_AVERMEDIA_STUDIO_505: 7454 + case SAA7134_BOARD_AVERMEDIA_505: 7493 7455 case SAA7134_BOARD_AVERMEDIA_STUDIO_307: 7494 7456 case SAA7134_BOARD_AVERMEDIA_307: 7495 7457 case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
+2
drivers/media/pci/saa7134/saa7134-input.c
··· 485 485 case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: 486 486 case SAA7134_BOARD_AVERMEDIA_305: 487 487 case SAA7134_BOARD_AVERMEDIA_307: 488 + case SAA7134_BOARD_AVERMEDIA_505: 488 489 case SAA7134_BOARD_AVERMEDIA_STUDIO_305: 489 490 case SAA7134_BOARD_AVERMEDIA_STUDIO_505: 490 491 case SAA7134_BOARD_AVERMEDIA_STUDIO_307: ··· 634 633 case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: 635 634 case SAA7134_BOARD_AVERMEDIA_305: 636 635 case SAA7134_BOARD_AVERMEDIA_307: 636 + case SAA7134_BOARD_AVERMEDIA_505: 637 637 case SAA7134_BOARD_AVERMEDIA_STUDIO_305: 638 638 case SAA7134_BOARD_AVERMEDIA_STUDIO_505: 639 639 case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
+1
drivers/media/pci/saa7134/saa7134.h
··· 341 341 #define SAA7134_BOARD_HAWELL_HW_9004V1 191 342 342 #define SAA7134_BOARD_AVERMEDIA_A706 192 343 343 #define SAA7134_BOARD_WIS_VOYAGER 193 344 + #define SAA7134_BOARD_AVERMEDIA_505 194 344 345 345 346 #define SAA7134_MAXBOARDS 32 346 347 #define SAA7134_INPUT_MAX 8