diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-15 12:51:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-15 12:51:29 +0100 |
| commit | 395d33bb16576ecfffd07c2ed2dfc7624e75f48a (patch) | |
| tree | 2b166bcf36d17818beafc8c2b02d17e4c53d2b63 | |
| parent | 0a81cbefba91cb1a77170f8fbf082114590c3e14 (diff) | |
| parent | 1c6d36805fcbd9f84b6d9252b4d022653df8d1fa (diff) | |
| download | op-kernel-dev-395d33bb16576ecfffd07c2ed2dfc7624e75f48a.zip op-kernel-dev-395d33bb16576ecfffd07c2ed2dfc7624e75f48a.tar.gz | |
Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
| -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 163ec38..0c8aefa 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -259,13 +259,13 @@ static const struct soc_enum pcm512x_veds = pcm512x_ramp_step_text); static const struct snd_kcontrol_new pcm512x_controls[] = { -SOC_DOUBLE_R_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2, +SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), -SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, +SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, PCM512x_RQMR_SHIFT, 1, 1), SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1), |
