Commit e08323f0 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0170a482

Documentation/video4linux/CARDLIST.ivtv

+6 −0
Original line number Diff line number Diff line
@@ -16,3 +16,9 @@ 
16 -> GOTVIEW PCI DVD2 Deluxe 			[ffac:0600]

17 -> Yuan MPC622 				[ff01:d998]

18 -> Digital Cowboy DCT-MTVP1 			[1461:bfff]

19 -> Yuan PG600V2/GotView PCI DVD Lite 	[ffab:0600,ffad:0600]

20 -> Club3D ZAP-TV1x01				[ffab:0600]

21 -> AverTV MCE 116 Plus			[1461:c439]

22 -> ASUS Falcon2				[1043:4b66,1043:462e,1043:4b2e]

23 -> AverMedia PVR-150 Plus			[1461:c035]

24 -> AverMedia EZMaker PCI Deluxe		[1461:c03f]

drivers/media/video/ivtv/ivtv-cards.c

+29 −0
Original line number Diff line number Diff line
@@ -956,6 +956,34 @@ static const struct ivtv_card ivtv_card_aver_pvr150 = { 


/* ------------------------------------------------------------------------- */



/* AVerMedia EZMaker PCI Deluxe card */



static const struct ivtv_card_pci_info ivtv_pci_aver_ezmaker[] = {

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc03f },

	{ 0, 0, 0 }

};



static const struct ivtv_card ivtv_card_aver_ezmaker = {

	.type = IVTV_CARD_AVER_EZMAKER,

	.name = "AVerMedia EZMaker PCI Deluxe",

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.hw_video = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,

	.hw_audio_ctrl = IVTV_HW_CX25840,

	.hw_all = IVTV_HW_CX25840 | IVTV_HW_WM8739,

	.video_inputs = {

		{ IVTV_CARD_INPUT_SVIDEO1,    0, CX25840_SVIDEO3 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 0, CX25840_COMPOSITE1 },

	},

	.audio_inputs = {

		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 0 },

	},

	.gpio_init = { .direction = 0x4000, .initial_value = 0x4000 },

	.pci_list = ivtv_pci_aver_ezmaker,

};



/* ------------------------------------------------------------------------- */



/* ASUS Falcon2 */



static const struct ivtv_card_pci_info ivtv_pci_asus_falcon2[] = {
@@ -1016,6 +1044,7 @@ static const struct ivtv_card *ivtv_card_list[] = { 
	&ivtv_card_avertv_mce116,

	&ivtv_card_asus_falcon2,

	&ivtv_card_aver_pvr150,

	&ivtv_card_aver_ezmaker,



	/* Variations of standard cards but with the same PCI IDs.

	   These cards must come last in this list. */

drivers/media/video/ivtv/ivtv-cards.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 
#define IVTV_CARD_AVERTV_MCE116	     20 /* AVerTV MCE 116 Plus */

#define IVTV_CARD_ASUS_FALCON2	     21 /* ASUS Falcon2 */

#define IVTV_CARD_AVER_PVR150PLUS    22 /* AVerMedia PVR-150 Plus */

#define IVTV_CARD_LAST 		     22

#define IVTV_CARD_AVER_EZMAKER       23 /* AVerMedia EZMaker PCI Deluxe */

#define IVTV_CARD_LAST 		     23



/* Variants of existing cards but with the same PCI IDs. The driver

   detects these based on other device information.

drivers/media/video/ivtv/ivtv-driver.c

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ MODULE_PARM_DESC(cardtype, 
		 "\t\t\t21 = AverTV MCE 116 Plus\n"

		 "\t\t\t22 = ASUS Falcon2\n"

		 "\t\t\t23 = AverMedia PVR-150 Plus\n"

		 "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n"

		 "\t\t\t 0 = Autodetect (default)\n"

		 "\t\t\t-1 = Ignore this card\n\t\t");

MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");