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

This project is archived. Its data is read-only.

Commit 082c0576 authored Sep 21, 2012 by Alfredo Jesús Delaiti Committed by Mauro Carvalho Chehab Oct 06, 2012

[media] Mygica X8507 audio for YPbPr, AV and S-Video



Adds audio support for input YPbPr, AV and S-Video on Mygica X8507 card.

Remains to be done: IR, FM and ISDBT

Signed-off-by: Alfredo J. Delaiti <alfredodelaiti@netscape.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 44e0d7de

drivers/media/pci/cx23885/cx23885-cards.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -542,11 +542,13 @@ struct cx23885_board cx23885_boards[] = {
		{
		.type = CX23885_VMUX_COMPOSITE1,
		.vmux = CX25840_COMPOSITE8,
		.amux = CX25840_AUDIO7,
		},
		{
		.type = CX23885_VMUX_SVIDEO,
		.vmux = CX25840_SVIDEO_LUMA3 \|
		CX25840_SVIDEO_CHROMA4,
		.amux = CX25840_AUDIO7,
		},
		{
		.type = CX23885_VMUX_COMPONENT,
		@@ -554,6 +556,7 @@ struct cx23885_board cx23885_boards[] = {
		CX25840_VIN1_CH1 \|
		CX25840_VIN6_CH2 \|
		CX25840_VIN7_CH3,
		.amux = CX25840_AUDIO7,
		},
		},
		},

drivers/media/pci/cx23885/cx23885-video.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
		(dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) \|\|
		(dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) \|\|
		(dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) \|\|
		(dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850)) {
		(dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) \|\|
		(dev->board == CX23885_BOARD_MYGICA_X8507)) {
		/* Configure audio routing */
		v4l2_subdev_call(dev->sd_cx25840, audio, s_routing,
		INPUT(input)->amux, 0, 0);