diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-10 10:28:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-10 10:28:49 +0100 |
| commit | ed750192041fc4bc7a066c34db74f56c23024fcf (patch) | |
| tree | 130d78504885ce87c49d768c8753dd1106674ec4 | |
| parent | 56f1275b856dfafd9593a5010e3d3903e3823d7b (diff) | |
| parent | 7d8acf2cba81d7c64842b5dac0d7b3dae16f0378 (diff) | |
| download | olio-linux-3.10-ed750192041fc4bc7a066c34db74f56c23024fcf.tar.xz olio-linux-3.10-ed750192041fc4bc7a066c34db74f56c23024fcf.zip | |
Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus
| -rw-r--r-- | sound/soc/codecs/cs42l52.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 030f53c96ec..987f728718c 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -193,6 +193,8 @@ static DECLARE_TLV_DB_SCALE(mic_tlv, 1600, 100, 0); static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0); +static DECLARE_TLV_DB_SCALE(mix_tlv, -50, 50, 0); + static const unsigned int limiter_tlv[] = { TLV_DB_RANGE_HEAD(2), 0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0), @@ -260,7 +262,7 @@ static const char * const hp_gain_num_text[] = { }; static const struct soc_enum hp_gain_enum = - SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 4, + SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 5, ARRAY_SIZE(hp_gain_num_text), hp_gain_num_text); static const char * const beep_pitch_text[] = { @@ -441,7 +443,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, - 0, 0x7f, 0x19, hl_tlv), + 0, 0x7f, 0x19, mix_tlv), SOC_DOUBLE_R("PCM Mixer Switch", CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1), |