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

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

V4L/DVB (8069): cx18: Fix S-Video and Compsite inputs for the Yuan MPC718 and enable card entry 



cx18: Fix S-Video and Compsite input settings for the Yuan MPC718 per user
reports from Yuri Warczynski <Yuri.Warczynski@gmail.com> and
Brian Hope <brian@hopefamily.info> and enable the card entry.  The tuner reset
GPIO pin is likely incorrect as the tuner firmware cannot be reloaded without a
reboot.  It is likely the audio routing is done via GPIO which is not
implemented yet, as users report audio doesn't work for some inputs.

Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1f09e8a2

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

+14 −11
Original line number Diff line number Diff line
@@ -194,23 +194,26 @@ static const struct cx18_card_pci_info cx18_pci_mpc718[] = { 
static const struct cx18_card cx18_card_mpc718 = {

	.type = CX18_CARD_YUAN_MPC718,

	.name = "Yuan MPC718",

	.comment = "Not yet supported!\n",

	.v4l2_capabilities = 0,

	.comment = "Some Composite and S-Video inputs are currently working.\n",

	.v4l2_capabilities = CX18_CAP_ENCODER,

	.hw_audio_ctrl = CX18_HW_CX23418,

	.hw_all = CX18_HW_TUNER,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 },

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },

		{ CX18_CARD_INPUT_SVIDEO1,    1,

				CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },

		{ CX18_CARD_INPUT_SVIDEO2,    2,

				CX18_AV_SVIDEO_LUMA7 | CX18_AV_SVIDEO_CHROMA8 },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE6 },

		{ CX18_CARD_INPUT_COMPOSITE3, 2, CX18_AV_COMPOSITE3 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX18_AV_AUDIO8, 0 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX18_AV_AUDIO_SERIAL, 0 },

		{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,       0 },

		{ CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL, 0 },

		{ CX18_CARD_INPUT_LINE_IN2,  CX18_AV_AUDIO_SERIAL, 0 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX18_AV_AUDIO_SERIAL, 0 },

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO_SERIAL, 0 },

	.tuners = {

		/* XC3028 tuner */

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