summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2020-12-07 12:53:36 +0000
committerMark Brown <broonie@kernel.org>2020-12-09 12:13:42 +0000
commit4f293dfea9f6d23a972be0e38556f5b0c02c2d4e (patch)
tree545edc84c606f31bbaba836453cbf47c21560ab7 /sound
parent6b4da5374b10a48be18df26288125746f1858507 (diff)
downloadlinux-4f293dfea9f6d23a972be0e38556f5b0c02c2d4e.tar.bz2
ASoC: codecs/jz4770: Don't change cap-couple setting in HP PMU/PMD
There is simply no reason to do that. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20201207125338.119397-4-paul@crapouillou.net Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/jz4770.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/jz4770.c b/sound/soc/codecs/jz4770.c
index 0da966785aee..909b70e817b4 100644
--- a/sound/soc/codecs/jz4770.c
+++ b/sound/soc/codecs/jz4770.c
@@ -371,9 +371,9 @@ static int hpout_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- /* set cap-less, unmute HP */
+ /* unmute HP */
regmap_clear_bits(jz_codec->regmap, JZ4770_CODEC_REG_CR_HP,
- REG_CR_HP_SB_HPCM | REG_CR_HP_MUTE);
+ REG_CR_HP_MUTE);
break;
case SND_SOC_DAPM_POST_PMU:
@@ -394,9 +394,9 @@ static int hpout_event(struct snd_soc_dapm_widget *w,
break;
case SND_SOC_DAPM_POST_PMD:
- /* set cap-couple, mute HP */
+ /* mute HP */
regmap_set_bits(jz_codec->regmap, JZ4770_CODEC_REG_CR_HP,
- REG_CR_HP_SB_HPCM | REG_CR_HP_MUTE);
+ REG_CR_HP_MUTE);
err = regmap_read_poll_timeout(jz_codec->regmap,
JZ4770_CODEC_REG_IFR,