Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271966
b: refs/heads/master
c: 2ccdd9a
h: refs/heads/master
v: v3
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 14, 2011
1 parent 6002669 commit 89a74f2
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9368da71804053a6f84d170c63c6cb86c8318b2
refs/heads/master: 2ccdd9a59b3a1ff3bd1be6390c4b1989a008e61c
10 changes: 9 additions & 1 deletion trunk/drivers/media/video/cx25840/cx25840-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ void cx25840_audio_set_path(struct i2c_client *client)

static void set_volume(struct i2c_client *client, int volume)
{
struct cx25840_state *state = to_state(i2c_get_clientdata(client));
int vol;

/* Convert the volume to msp3400 values (0-127) */
Expand All @@ -495,7 +496,14 @@ static void set_volume(struct i2c_client *client, int volume)
}

/* PATH1_VOLUME */
cx25840_write(client, 0x8d4, 228 - (vol * 2));
if (is_cx2388x(state)) {
/* for cx23885 volume doesn't work,
* the calculation always results in
* e4 regardless.
*/
cx25840_write(client, 0x8d4, volume);
} else
cx25840_write(client, 0x8d4, 228 - (vol * 2));
}

static void set_balance(struct i2c_client *client, int balance)
Expand Down
11 changes: 11 additions & 0 deletions trunk/drivers/media/video/cx25840/cx25840-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1074,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;
}

Expand Down

0 comments on commit 89a74f2

Please sign in to comment.