Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

V4L/DVB (5995): ivtv: add AverMedia M116 



- Split Club3D card from Yuan PG600-2, GotView PCI DVD Lite
  (different composite input)
- Add AVerTV MCE 116 Plus (M116) card
- Allow Xceive cards to be used without Xceive support

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2cc72095

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

+68 −13
Original line number Diff line number Diff line
@@ -823,9 +823,7 @@ static const struct ivtv_card ivtv_card_dctmvtvp1 = { 


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



#ifdef HAVE_XC3028



/* Yuan PG600-2/GotView PCI DVD Lite/Club3D ZAP-TV1x01 cards */

/* Yuan PG600-2/GotView PCI DVD Lite cards */



static const struct ivtv_card_pci_info ivtv_pci_pg600v2[] = {

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_YUAN3,     0x0600 },
@@ -835,30 +833,87 @@ static const struct ivtv_card_pci_info ivtv_pci_pg600v2[] = { 


static const struct ivtv_card ivtv_card_pg600v2 = {

	.type = IVTV_CARD_PG600V2,

	.name = "Yuan PG600-2, GotView PCI DVD Lite, Club3D ZAP-TV1x01",

	.name = "Yuan PG600-2, GotView PCI DVD Lite",

	.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_TUNER,

	.video_inputs = {

		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },

		{ IVTV_CARD_INPUT_SVIDEO1,    1,

		{ IVTV_CARD_INPUT_SVIDEO1,    0,

		  CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 0, CX25840_COMPOSITE1 },

	},

	.audio_inputs = {

		{ IVTV_CARD_INPUT_AUD_TUNER,  CX25840_AUDIO5       },

		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL },

	},

	.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 },

	.tuners = {

		{ .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },

	},

	.gpio_init = { .direction = 0x1000, .initial_value = 0x1000 }, /* tuner reset */

	.pci_list = ivtv_pci_pg600v2,

};

#endif



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



/* Club3D ZAP-TV1x01 cards */



static const struct ivtv_card_pci_info ivtv_pci_club3d[] = {

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_YUAN3,     0x0600 },

	{ 0, 0, 0 }

};



static const struct ivtv_card ivtv_card_club3d = {

	.type = IVTV_CARD_CLUB3D,

	.name = "Club3D ZAP-TV1x01",

	.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_TUNER,

	.video_inputs = {

		{ IVTV_CARD_INPUT_SVIDEO1,    0,

		  CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 0, CX25840_COMPOSITE3 },

	},

	.audio_inputs = {

		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL },

	},

	.tuners = {

		{ .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },

	},

	.pci_list = ivtv_pci_club3d,

};



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



/* AVerTV MCE 116 Plus (M116) card */



static const struct ivtv_card_pci_info ivtv_pci_avertv_mce116[] = {

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc439 },

	{ 0, 0, 0 }

};



static const struct ivtv_card ivtv_card_avertv_mce116 = {

	.type = IVTV_CARD_AVERTV_MCE116,

	.name = "AVerTV MCE 116 Plus",

	.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_TUNER | 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, 1 },

	},

	.gpio_init = { .direction = 0xe000, .initial_value = 0x4000 }, /* enable line-in */

	.tuners = {

		{ .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },

	},

	.pci_list = ivtv_pci_avertv_mce116,

};



static const struct ivtv_card *ivtv_card_list[] = {

	&ivtv_card_pvr250,
@@ -879,9 +934,9 @@ static const struct ivtv_card *ivtv_card_list[] = { 
	&ivtv_card_gotview_pci_dvd2,

	&ivtv_card_yuan_mpc622,

	&ivtv_card_dctmvtvp1,

#ifdef HAVE_XC3028

	&ivtv_card_pg600v2,

#endif

	&ivtv_card_club3d,

	&ivtv_card_avertv_mce116,



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

	   These cards must come last in this list. */

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

+11 −16
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ MODULE_PARM_DESC(cardtype, 
		 "\t\t\t16 = GOTVIEW PCI DVD2 Deluxe\n"

		 "\t\t\t17 = Yuan MPC622\n"

		 "\t\t\t18 = Digital Cowboy DCT-MTVP1\n"

#ifdef HAVE_XC3028

		 "\t\t\t19 = Yuan PG600V2/GotView PCI DVD Lite/Club3D ZAP-TV1x01\n"

#endif

		 "\t\t\t19 = Yuan PG600V2/GotView PCI DVD Lite\n"

		 "\t\t\t20 = Club3D ZAP-TV1x01\n"

		 "\t\t\t21 = AverTV MCE 116 Plus\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");
@@ -821,11 +821,13 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) 
	/* load modules */

#ifndef CONFIG_VIDEO_TUNER

	if (hw & IVTV_HW_TUNER) {

		if (itv->options.tuner == TUNER_XCEIVE_XC3028) {

			IVTV_INFO("Xceive tuner not yet supported, only composite and S-Video inputs will be available\n");

			itv->tunerid = 1;

		}

		else {

			ivtv_request_module(itv, "tuner");

#ifdef HAVE_XC3028

		if (itv->options.tuner == TUNER_XCEIVE_XC3028)

			ivtv_request_module(itv, "xc3028-tuner");

#endif

		}

	}

#endif

#ifndef CONFIG_VIDEO_CX25840
@@ -1130,19 +1132,12 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	if (itv->options.radio > 0)

		itv->v4l2_cap |= V4L2_CAP_RADIO;



	if (itv->options.tuner > -1) {

	if (itv->options.tuner > -1 && itv->tunerid == 0) {

		struct tuner_setup setup;



		setup.addr = ADDR_UNSET;

		setup.type = itv->options.tuner;

		setup.mode_mask = T_ANALOG_TV;  /* matches TV tuners */

#ifdef HAVE_XC3028

		setup.initmode = V4L2_TUNER_ANALOG_TV;

		if (itv->options.tuner == TUNER_XCEIVE_XC3028) {

			setup.gpio_write = ivtv_reset_tuner_gpio;

			setup.gpio_priv = itv;

		}

#endif

		ivtv_call_i2c_clients(itv, TUNER_SET_TYPE_ADDR, &setup);

	}

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

+6 −8
Original line number Diff line number Diff line
@@ -63,10 +63,9 @@ 
#include <media/tuner.h>

#include <media/cx2341x.h>



/* #define HAVE_XC3028 1 */



#include <media/ivtv.h>





#define IVTV_ENCODER_OFFSET	0x00000000

#define IVTV_ENCODER_SIZE	0x00800000	/* Last half isn't needed 0x01000000 */
@@ -114,12 +113,10 @@ extern const u32 yuv_offset[4]; 
#define IVTV_CARD_GOTVIEW_PCI_DVD2   15	/* GotView PCI DVD2 */

#define IVTV_CARD_YUAN_MPC622        16	/* Yuan MPC622 miniPCI */

#define IVTV_CARD_DCTMTVP1 	     17 /* DIGITAL COWBOY DCT-MTVP1 */

#ifdef HAVE_XC3028

#define IVTV_CARD_PG600V2	     18 /* Yuan PG600V2/GotView PCI DVD Lite/Club3D ZAP-TV1x01 */

#define IVTV_CARD_LAST 		     18

#else

#define IVTV_CARD_LAST 		     17

#endif

#define IVTV_CARD_PG600V2	     18 /* Yuan PG600V2/GotView PCI DVD Lite */

#define IVTV_CARD_CLUB3D	     19 /* Club3D ZAP-TV1x01 */

#define IVTV_CARD_AVERTV_MCE116	     20 /* AVerTV MCE 116 Plus */

#define IVTV_CARD_LAST 		     20



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

   detects these based on other device information.
@@ -705,6 +702,7 @@ struct ivtv { 
	u8 nof_audio_inputs;	/* number of audio inputs */

	u32 v4l2_cap;		/* V4L2 capabilities of card */

	u32 hw_flags; 		/* Hardware description of the board */

	int tunerid;		/* Userspace tuner ID for experimental Xceive tuner support */



	/* controlling Video decoder function */

	int (*video_dec_func)(struct ivtv *, unsigned int, void *);

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

+0 −24
Original line number Diff line number Diff line
@@ -122,30 +122,6 @@ void ivtv_reset_ir_gpio(struct ivtv *itv) 
	write_reg(curdir, IVTV_REG_GPIO_DIR);

}



#ifdef HAVE_XC3028

int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr)

{

	int curdir, curout;

	struct ivtv *itv = (struct ivtv *) priv;



	if (itv->card->type != IVTV_CARD_PG600V2 || itv->options.tuner != TUNER_XCEIVE_XC3028)

		return -EINVAL;

	IVTV_INFO("Resetting tuner\n");

	curout = read_reg(IVTV_REG_GPIO_OUT);

	curdir = read_reg(IVTV_REG_GPIO_DIR);

	curdir |= (1 << 12);  /* GPIO bit 12 */



	curout &= ~(1 << 12);

	write_reg(curout, IVTV_REG_GPIO_OUT);

	schedule_timeout_interruptible(msecs_to_jiffies(1));



	curout |= (1 << 12);

	write_reg(curout, IVTV_REG_GPIO_OUT);

	schedule_timeout_interruptible(msecs_to_jiffies(1));



	return 0;

}

#endif



void ivtv_gpio_init(struct ivtv *itv)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
/* GPIO stuff */

void ivtv_gpio_init(struct ivtv *itv);

void ivtv_reset_ir_gpio(struct ivtv *itv);

int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr);

int ivtv_reset_tuner_gpio(void *dev, int cmd, int value);

int ivtv_gpio(struct ivtv *itv, unsigned int command, void *arg);