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

Commit d31b67d8 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12335): ivtv: Fix errors in AVerTV M113 card definitions and add a new M113 card 



Tested-by: default avatarRavi A. <asvravi@gmail.com>
Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e3e1920b

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

+19 −14
Original line number Original line Diff line number Diff line
@@ -977,26 +977,27 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = { 




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

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





/* AVerMedia PVR-150 Plus (M113) card */

/* AVerMedia PVR-150 Plus / AVerTV M113 cards with a Daewoo/Partsnic Tuner */





static const struct ivtv_card_pci_info ivtv_pci_aver_pvr150[] = {

static const struct ivtv_card_pci_info ivtv_pci_aver_pvr150[] = {

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc035 },

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc034 }, /* NTSC */

	{ PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc035 }, /* NTSC FM */

	{ 0, 0, 0 }

	{ 0, 0, 0 }

};

};





static const struct ivtv_card ivtv_card_aver_pvr150 = {

static const struct ivtv_card ivtv_card_aver_pvr150 = {

	.type = IVTV_CARD_AVER_PVR150PLUS,

	.type = IVTV_CARD_AVER_PVR150PLUS,

	.name = "AVerMedia PVR-150 Plus",

	.name = "AVerMedia PVR-150 Plus / AVerTV M113 Partsnic (Daewoo) Tuner",

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.hw_video = IVTV_HW_CX25840,

	.hw_video = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,

	.hw_audio_ctrl = IVTV_HW_CX25840,

	.hw_audio_ctrl = IVTV_HW_CX25840,

	.hw_muxer = IVTV_HW_GPIO,

	.hw_muxer = IVTV_HW_GPIO,

	.hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER,

	.hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER |

		  IVTV_HW_WM8739 | IVTV_HW_GPIO,

	.video_inputs = {

	.video_inputs = {

		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },

		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },

		{ IVTV_CARD_INPUT_SVIDEO1,    1,

		{ IVTV_CARD_INPUT_SVIDEO1,    1, CX25840_SVIDEO3    },

		  CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },

	},

	},

	.audio_inputs = {

	.audio_inputs = {
@@ -1004,13 +1005,18 @@ static const struct ivtv_card ivtv_card_aver_pvr150 = { 
		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 1 },

		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 1 },

	},

	},

	.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },

	.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },

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

	/* The 74HC4052 Dual 4:1 multiplexer is controlled by 2 GPIO lines */

	.gpio_audio_input  = { .mask = 0x0800, .tuner = 0, .linein = 0, .radio = 0x0800 },

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

	.gpio_audio_input  = { .mask   = 0xc000,

			       .tuner  = 0x0000,

			       .linein = 0x4000,

			       .radio  = 0x8000 },

	.tuners = {

	.tuners = {

		/* This card has a Partsnic PTI-5NF05 tuner */

		/* Subsystem ID's 0xc03[45] have a Partsnic PTI-5NF05 tuner */

		{ .std = V4L2_STD_MN, .tuner = TUNER_TCL_2002N },

		{ .std = V4L2_STD_MN, .tuner = TUNER_PARTSNIC_PTI_5NF05 },

	},

	},

	.pci_list = ivtv_pci_aver_pvr150,

	.pci_list = ivtv_pci_aver_pvr150,

	/* Subsystem ID 0xc035 has a TEA5767(?) FM tuner, 0xc034 does not */

	.i2c = &ivtv_i2c_radio,

	.i2c = &ivtv_i2c_radio,

};

};
@@ -1025,7 +1031,7 @@ static const struct ivtv_card_pci_info ivtv_pci_aver_ultra1500mce[] = { 




static const struct ivtv_card ivtv_card_aver_ultra1500mce = {

static const struct ivtv_card ivtv_card_aver_ultra1500mce = {

	.type = IVTV_CARD_AVER_ULTRA1500MCE,

	.type = IVTV_CARD_AVER_ULTRA1500MCE,

	.name = "AVerMedia UltraTV 1500 MCE / AVerTV M113",

	.name = "AVerMedia UltraTV 1500 MCE / AVerTV M113 Philips Tuner",

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.hw_video = IVTV_HW_CX25840,

	.hw_video = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,
@@ -1035,8 +1041,7 @@ static const struct ivtv_card ivtv_card_aver_ultra1500mce = { 
		  IVTV_HW_WM8739 | IVTV_HW_GPIO,

		  IVTV_HW_WM8739 | IVTV_HW_GPIO,

	.video_inputs = {

	.video_inputs = {

		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },

		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },

		{ IVTV_CARD_INPUT_SVIDEO1,    1,

		{ IVTV_CARD_INPUT_SVIDEO1,    1, CX25840_SVIDEO3    },

		  CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },

		{ IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },

	},

	},

	.audio_inputs = {

	.audio_inputs = {
@@ -1044,7 +1049,7 @@ static const struct ivtv_card ivtv_card_aver_ultra1500mce = { 
		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 1 },

		{ IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 1 },

	},

	},

	.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },

	.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },

	/* The 74HC4502 Dual 4:1 multiplexer is controlled by 2 GPIO lines */

	/* The 74HC4052 Dual 4:1 multiplexer is controlled by 2 GPIO lines */

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

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

	.gpio_audio_input  = { .mask   = 0xc000,

	.gpio_audio_input  = { .mask   = 0xc000,

			       .tuner  = 0x0000,

			       .tuner  = 0x0000,