diff options
| author | flar2 <asegaert@gmail.com> | 2016-10-02 21:47:55 -0400 |
|---|---|---|
| committer | Ali Al-Asadi <alasadi56@gmail.com> | 2018-03-03 17:46:19 +0100 |
| commit | c5dfadd580183233ef38f2f33537ce8c46c380a4 (patch) | |
| tree | 10c0a91bb1e64713b5ed1b38b5c5b2652fd1ca37 | |
| parent | 83368abf3c1da38b3ee9e3678c13e9a81ada603c (diff) | |
sound_control: prevent speaker gain reset
Change-Id: I031e31d4e6b26f78ae2d6fa3a4db5bbc6978fe7f
| -rw-r--r-- | sound/soc/codecs/cs35l34.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c index fe28c5a13c3..0fd8a428ac4 100644 --- a/sound/soc/codecs/cs35l34.c +++ b/sound/soc/codecs/cs35l34.c @@ -294,7 +294,9 @@ static int cs35l34_main_amp_event(struct snd_soc_dapm_widget *w, return 0; } +#ifndef CONFIG_SOUND_CONTROL static DECLARE_TLV_DB_SCALE(dig_vol_tlv, -10200, 50, 0); +#endif static const char * const gain_labels[] = {"3dB", "4dB", "5dB", "6dB", "7dB", "8dB", "9dB", "10dB", "11dB", "12dB", "13dB", "14dB", @@ -304,8 +306,10 @@ static const SOC_ENUM_SINGLE_DECL(amp_gain, CS35L34_AMP_ANLG_GAIN_CTL, 0, gain_labels); static const struct snd_kcontrol_new cs35l34_snd_controls[] = { +#ifndef CONFIG_SOUND_CONTROL SOC_SINGLE_SX_TLV("Digital Volume", CS35L34_AMP_DIG_VOL, 0, 0x34, 0xE4, dig_vol_tlv), +#endif SOC_ENUM("AMP Gain", amp_gain), }; |