[media] cx23885: Enable audio line in support from the back panel

[mirror_ubuntu-artful-kernel.git] / drivers / media / video / cx25840 / cx25840-core.c

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index b7ee2ae70583decb1c2afabbfdca62949532e699..0316e41b55cd01f585d11bfc65d48a8023b2a4b5 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -702,6 +702,13 @@ static void cx231xx_initialize(struct i2c_client *client)
 
        /* start microcontroller */
        cx25840_and_or(client, 0x803, ~0x10, 0x10);
+
+       /* CC raw enable */
+       cx25840_write(client, 0x404, 0x0b);
+
+       /* CC on */
+       cx25840_write(client, 0x42f, 0x66);
+       cx25840_write4(client, 0x474, 0x1e1e601a);
 }
 
 /* ----------------------------------------------------------------------- */
@@ -1067,6 +1074,17 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
                cx25840_write(client, 0x919, 0x01);
        }
 
+       if (is_cx2388x(state) && (aud_input == CX25840_AUDIO7)) {
+               /* Configure audio from LR1 or LR2 input */
+               cx25840_write4(client, 0x910, 0);
+               cx25840_write4(client, 0x8d0, 0x63073);
+       } else
+       if (is_cx2388x(state) && (aud_input == CX25840_AUDIO8)) {
+               /* Configure audio from tuner/sif input */
+               cx25840_write4(client, 0x910, 0x12b000c9);
+               cx25840_write4(client, 0x8d0, 0x1f063870);
+       }
+
        return 0;
 }