diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:52 +0100 |
| commit | c200d8881634a390bcb6ef4e23aa5d9a08d41efa (patch) | |
| tree | 1ed0409747fe2d3968fc813cfcc809ba53498ee5 /sound | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | 8806d96db7b04fffba4cfc9ceac31d24c8517fe9 (diff) | |
| download | op-kernel-dev-c200d8881634a390bcb6ef4e23aa5d9a08d41efa.zip op-kernel-dev-c200d8881634a390bcb6ef4e23aa5d9a08d41efa.tar.gz | |
Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cs42l52.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 987f728..be2ba1b 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -195,6 +195,8 @@ static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0); static DECLARE_TLV_DB_SCALE(mix_tlv, -50, 50, 0); +static DECLARE_TLV_DB_SCALE(beep_tlv, -56, 200, 0); + static const unsigned int limiter_tlv[] = { TLV_DB_RANGE_HEAD(2), 0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0), @@ -451,7 +453,8 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { SOC_ENUM("Beep Pitch", beep_pitch_enum), SOC_ENUM("Beep on Time", beep_ontime_enum), SOC_ENUM("Beep off Time", beep_offtime_enum), - SOC_SINGLE_TLV("Beep Volume", CS42L52_BEEP_VOL, 0, 0x1f, 0x07, hl_tlv), + SOC_SINGLE_SX_TLV("Beep Volume", CS42L52_BEEP_VOL, + 0, 0x07, 0x1f, beep_tlv), SOC_SINGLE("Beep Mixer Switch", CS42L52_BEEP_TONE_CTL, 5, 1, 1), SOC_ENUM("Beep Treble Corner Freq", beep_treble_enum), SOC_ENUM("Beep Bass Corner Freq", beep_bass_enum), |
