diff options
| author | Howard Mitchell <hm@hmbedded.co.uk> | 2015-03-19 08:08:30 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-21 14:26:17 -0400 |
| commit | 4d9b13c7cc803fbde59d7e998f7de2b9a2101c7e (patch) | |
| tree | 7e62bd10a9aa4196a96de554b95c8c91296e6c78 | |
| parent | 3088ef9f5dec3d72b24dcdd33d240823ab26b432 (diff) | |
ASoC: pcm512x: Add 'Analogue' prefix to analogue volume controls
This is to ensure that 'alsactl restore' does not apply default
initialisation as the chip reset defaults are preferred.
Signed-off-by: Howard Mitchell <hm@hmbedded.co.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
| -rw-r--r-- | sound/soc/codecs/pcm512x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 9974f201a08f..194f4c8c5611 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c | |||
| @@ -304,9 +304,9 @@ static const struct soc_enum pcm512x_veds = | |||
| 304 | static const struct snd_kcontrol_new pcm512x_controls[] = { | 304 | static const struct snd_kcontrol_new pcm512x_controls[] = { |
| 305 | SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, | 305 | SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, |
| 306 | PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), | 306 | PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), |
| 307 | SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, | 307 | SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL, |
| 308 | PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), | 308 | PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), |
| 309 | SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, | 309 | SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, |
| 310 | PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), | 310 | PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), |
| 311 | SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, | 311 | SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, |
| 312 | PCM512x_RQMR_SHIFT, 1, 1), | 312 | PCM512x_RQMR_SHIFT, 1, 1), |
