Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / drivers / media / video / cx25840 / cx25840-audio.c

diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c
index f035f2b..f897c1e 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-audio.c
+++ b/drivers/media/video/cx25840/cx25840-audio.c
@@ -30,10 +30,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
        if (freq != 32000 && freq != 44100 && freq != 48000)
                return -EINVAL;
 
-       /* assert soft reset */
-       if (!state->is_cx25836)
-               cx25840_and_or(client, 0x810, ~0x1, 0x01);
-
        /* common for all inputs and rates */
        /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x10 */
        cx25840_write(client, 0x127, 0x50);
@@ -152,10 +148,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                }
        }
 
-       /* deassert soft reset */
-       if (!state->is_cx25836)
-               cx25840_and_or(client, 0x810, ~0x1, 0x00);
-
        state->audclk_freq = freq;
 
        return 0;
@@ -168,6 +160,10 @@ void cx25840_audio_set_path(struct i2c_client *client)
        /* stop microcontroller */
        cx25840_and_or(client, 0x803, ~0x10, 0);
 
+       /* assert soft reset */
+       if (!state->is_cx25836)
+               cx25840_and_or(client, 0x810, ~0x1, 0x01);
+
        /* Mute everything to prevent the PFFT! */
        cx25840_write(client, 0x8d3, 0x1f);
 
@@ -181,13 +177,19 @@ void cx25840_audio_set_path(struct i2c_client *client)
        } else {
                /* Set Path1 to Analog Demod Main Channel */
                cx25840_write4(client, 0x8d0, 0x7038061f);
+       }
 
+       set_audclk_freq(client, state->audclk_freq);
+
+       /* deassert soft reset */
+       if (!state->is_cx25836)
+               cx25840_and_or(client, 0x810, ~0x1, 0x00);
+
+       if (state->aud_input != CX25840_AUDIO_SERIAL) {
                /* When the microcontroller detects the
                 * audio format, it will unmute the lines */
                cx25840_and_or(client, 0x803, ~0x10, 0x10);
        }
-
-       set_audclk_freq(client, state->audclk_freq);
 }
 
 static int get_volume(struct i2c_client *client)
@@ -311,11 +313,25 @@ static void set_mute(struct i2c_client *client, int mute)
 
 int cx25840_audio(struct i2c_client *client, unsigned int cmd, void *arg)
 {
+       struct cx25840_state *state = i2c_get_clientdata(client);
        struct v4l2_control *ctrl = arg;
+       int retval;
 
        switch (cmd) {
        case VIDIOC_INT_AUDIO_CLOCK_FREQ:
-               return set_audclk_freq(client, *(u32 *)arg);
+               if (state->aud_input != CX25840_AUDIO_SERIAL) {
+                       cx25840_and_or(client, 0x803, ~0x10, 0);
+                       cx25840_write(client, 0x8d3, 0x1f);
+               }
+               if (!state->is_cx25836)
+                       cx25840_and_or(client, 0x810, ~0x1, 1);
+               retval = set_audclk_freq(client, *(u32 *)arg);
+               if (!state->is_cx25836)
+                       cx25840_and_or(client, 0x810, ~0x1, 0);
+               if (state->aud_input != CX25840_AUDIO_SERIAL) {
+                       cx25840_and_or(client, 0x803, ~0x10, 0x10);
+               }
+               return retval;
 
        case VIDIOC_G_CTRL:
                switch (ctrl->id) {