summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>2019-05-16 14:30:57 +0300
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-04-15 01:24:39 +0200
commit2dedf2a501653ac399fa56bfe15a94fd1061adba (patch)
tree83e578eb27c40e9c718d1fcee99fff2919cf8c1a /sound
parentde20e1613fadc3dd4656a4ddc312eb4e0fbaf58a (diff)
ASoC: sgtl5000: fix setting Mic volume
Fix regression bug, introduced in commit f3762a6b4a0d059fae4a7aa2e4941f251a3744d5. Related to: #48500 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/sgtl5000.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 79e59a2f36b5..686fd84dc2bc 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -576,17 +576,12 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
SGTL5000_HP_MUTE_SHIFT, 1, 1),
SOC_SINGLE("Headphone Playback ZC Switch", SGTL5000_CHIP_ANA_CTRL,
SGTL5000_HP_ZCD_EN, 1, 0),
- SOC_SINGLE("Headphone Playback Switch", SGTL5000_CHIP_ANA_CTRL,
- SGTL5000_HP_MUTE_SHIFT, 1, 1),
-
- /* Lineout */
- SOC_SINGLE("Lineout Playback Switch", SGTL5000_CHIP_ANA_CTRL,
- SGTL5000_LINE_MUTE_SHIFT, 1, 1),
/* Microphone */
SOC_SINGLE_TLV("Mic Volume", SGTL5000_CHIP_MIC_CTRL,
SGTL5000_MIC_GAIN_SHIFT, 3, 0, mic_gain_tlv),
+ /* Lineout */
SOC_DOUBLE_TLV("Lineout Playback Volume",
SGTL5000_CHIP_LINE_OUT_VOL,
SGTL5000_LINE_OUT_VOL_LEFT_SHIFT,