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

V4L/DVB (6763): ivtv: add AVerMedia EZMaker PCI Deluxe support

Add support for the AVerMedia EZMaker PCI Deluxe and update the ivtv cardlist.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
e08323f0 0170a482

+38 -1
+6
Documentation/video4linux/CARDLIST.ivtv
··· 16 16 16 -> GOTVIEW PCI DVD2 Deluxe [ffac:0600] 17 17 17 -> Yuan MPC622 [ff01:d998] 18 18 18 -> Digital Cowboy DCT-MTVP1 [1461:bfff] 19 + 19 -> Yuan PG600V2/GotView PCI DVD Lite [ffab:0600,ffad:0600] 20 + 20 -> Club3D ZAP-TV1x01 [ffab:0600] 21 + 21 -> AverTV MCE 116 Plus [1461:c439] 22 + 22 -> ASUS Falcon2 [1043:4b66,1043:462e,1043:4b2e] 23 + 23 -> AverMedia PVR-150 Plus [1461:c035] 24 + 24 -> AverMedia EZMaker PCI Deluxe [1461:c03f]
+29
drivers/media/video/ivtv/ivtv-cards.c
··· 956 956 957 957 /* ------------------------------------------------------------------------- */ 958 958 959 + /* AVerMedia EZMaker PCI Deluxe card */ 960 + 961 + static const struct ivtv_card_pci_info ivtv_pci_aver_ezmaker[] = { 962 + { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc03f }, 963 + { 0, 0, 0 } 964 + }; 965 + 966 + static const struct ivtv_card ivtv_card_aver_ezmaker = { 967 + .type = IVTV_CARD_AVER_EZMAKER, 968 + .name = "AVerMedia EZMaker PCI Deluxe", 969 + .v4l2_capabilities = IVTV_CAP_ENCODER, 970 + .hw_video = IVTV_HW_CX25840, 971 + .hw_audio = IVTV_HW_CX25840, 972 + .hw_audio_ctrl = IVTV_HW_CX25840, 973 + .hw_all = IVTV_HW_CX25840 | IVTV_HW_WM8739, 974 + .video_inputs = { 975 + { IVTV_CARD_INPUT_SVIDEO1, 0, CX25840_SVIDEO3 }, 976 + { IVTV_CARD_INPUT_COMPOSITE1, 0, CX25840_COMPOSITE1 }, 977 + }, 978 + .audio_inputs = { 979 + { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL, 0 }, 980 + }, 981 + .gpio_init = { .direction = 0x4000, .initial_value = 0x4000 }, 982 + .pci_list = ivtv_pci_aver_ezmaker, 983 + }; 984 + 985 + /* ------------------------------------------------------------------------- */ 986 + 959 987 /* ASUS Falcon2 */ 960 988 961 989 static const struct ivtv_card_pci_info ivtv_pci_asus_falcon2[] = { ··· 1044 1016 &ivtv_card_avertv_mce116, 1045 1017 &ivtv_card_asus_falcon2, 1046 1018 &ivtv_card_aver_pvr150, 1019 + &ivtv_card_aver_ezmaker, 1047 1020 1048 1021 /* Variations of standard cards but with the same PCI IDs. 1049 1022 These cards must come last in this list. */
+2 -1
drivers/media/video/ivtv/ivtv-cards.h
··· 47 47 #define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */ 48 48 #define IVTV_CARD_ASUS_FALCON2 21 /* ASUS Falcon2 */ 49 49 #define IVTV_CARD_AVER_PVR150PLUS 22 /* AVerMedia PVR-150 Plus */ 50 - #define IVTV_CARD_LAST 22 50 + #define IVTV_CARD_AVER_EZMAKER 23 /* AVerMedia EZMaker PCI Deluxe */ 51 + #define IVTV_CARD_LAST 23 51 52 52 53 /* Variants of existing cards but with the same PCI IDs. The driver 53 54 detects these based on other device information.
+1
drivers/media/video/ivtv/ivtv-driver.c
··· 187 187 "\t\t\t21 = AverTV MCE 116 Plus\n" 188 188 "\t\t\t22 = ASUS Falcon2\n" 189 189 "\t\t\t23 = AverMedia PVR-150 Plus\n" 190 + "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n" 190 191 "\t\t\t 0 = Autodetect (default)\n" 191 192 "\t\t\t-1 = Ignore this card\n\t\t"); 192 193 MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");