UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-2.6.30' into for-2.6.31

This commit is contained in:
Mark Brown 2009-04-28 19:33:45 +01:00
parent 6be01cfb85 18cc8d8d9b
commit 72e31981a4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/twl4030.c
View File

@ -802,6 +802,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0);
*/ */
static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1);
/*
* Gain control for earpiece amplifier
* 0 dB to 12 dB in 6 dB steps (mute instead of -6)
*/
static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1);
/* /*
* Capture gain after the ADCs * Capture gain after the ADCs
* from 0 dB to 31 dB in 1 dB steps * from 0 dB to 31 dB in 1 dB steps
@ -877,7 +883,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
4, 3, 0, output_tvl), 4, 3, 0, output_tvl),
SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume",
TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl), TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl),
/* Common capture gain controls */ /* Common capture gain controls */
SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume",