diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-29 12:11:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 02:00:17 -0300 |
| commit | c0c044a71f3d0a0a73c954b389cbc4b55ed4c2ba (patch) | |
| tree | e6b2a43722b66dd8bd4f1934b2f2fde9f46e36ec /drivers/media/video | |
| parent | e2b8cf4ced47465b24d6fe911714827475fb0412 (diff) | |
| download | blackbird-op-linux-c0c044a71f3d0a0a73c954b389cbc4b55ed4c2ba.tar.gz blackbird-op-linux-c0c044a71f3d0a0a73c954b389cbc4b55ed4c2ba.zip | |
V4L/DVB (4006): Stop/start microcontroller when changing sampling frequency
Stop/start microcontroller when changing sampling frequency to prevent
tinny audio.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-audio.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c index f035f2b9ffd1..b67ad4deff8a 100644 --- a/drivers/media/video/cx25840/cx25840-audio.c +++ b/drivers/media/video/cx25840/cx25840-audio.c @@ -181,13 +181,15 @@ 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); + 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,21 @@ 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); + } + retval = set_audclk_freq(client, *(u32 *)arg); + if (state->aud_input != CX25840_AUDIO_SERIAL) { + cx25840_and_or(client, 0x803, ~0x10, 0x10); + } + return retval; case VIDIOC_G_CTRL: switch (ctrl->id) { |
