Mygica X8507 audio for YPbPr, AV and S-Video

Commit Message

Alfredo Jesús Delaiti Sept. 3, 2012, 8:14 p.m. UTC

Hi

This patch add audio support for input YPbPr, AV and S-Video for Mygica 
X8507 card.
I tried it with the 3.4 and 3.5 kernel

Remains to be done: IR, FM and ISDBT

Sorry if I sent the patch improperly.

Signed-off-by: Alfredo J. Delaiti <[e-mail]>

Patch

diff --git a/media/video/cx23885/cx23885-cards.c b/media/video/cx23885/cx23885-cards.c
index 080e111..17e2576 100644
--- a/media/video/cx23885/cx23885-cards.c
+++ b/media/video/cx23885/cx23885-cards.c
@@ -541,11 +541,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,
@@ -553,6 +555,7 @@  struct cx23885_board cx23885_boards[] = {
                                         CX25840_VIN1_CH1 |
                                         CX25840_VIN6_CH2 |
                                         CX25840_VIN7_CH3,
+                               .amux   = CX25840_AUDIO7,
                         },
                 },
         },
diff --git a/media/video/cx23885/cx23885-video.c b/media/video/cx23885/cx23885-video.c
index 22f8e7f..fcb3f22 100644
--- a/media/video/cx23885/cx23885-video.c
+++ b/media/video/cx23885/cx23885-video.c
@@ -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);