diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-02-15 15:21:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-03-10 12:48:32 +0000 |
| commit | caba8d764770b6824391c5bf3c3eba6e51b69330 (patch) | |
| tree | 14878eab96dd147219fe895bdbd497d46e186205 /sound | |
| parent | d917b5dde660b11abd757bf99a29353c36880b2c (diff) | |
| download | linux-stable-caba8d764770b6824391c5bf3c3eba6e51b69330.tar.gz linux-stable-caba8d764770b6824391c5bf3c3eba6e51b69330.tar.bz2 linux-stable-caba8d764770b6824391c5bf3c3eba6e51b69330.zip | |
ASoC: rt5670: Remove 'HP Playback Switch' control
The RT5670_L_MUTE_SFT and RT5670_R_MUTE_SFT bits (bits 15 and 7) of the
RT5670_HP_VOL register are set / unset by the headphones deplop code
run by rt5670_hp_event() on SND_SOC_DAPM_POST_PMU / SND_SOC_DAPM_PRE_PMD.
So we should not also export a control to userspace which toggles these
same bits.
This should not cause any issues for userspace. AFAICT the rt567x codecs
are only used on x86/ACPI devices and the UCM profiles used there do not
use the "HP Playback Switch" control.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210215142118.308516-3-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5670.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index 2e799e21dbda..932e4cd1e9a6 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -631,8 +631,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_enum, RT5670_DIG_INF1_DATA, static const struct snd_kcontrol_new rt5670_snd_controls[] = { /* Headphone Output Volume */ - SOC_DOUBLE("HP Playback Switch", RT5670_HP_VOL, - RT5670_L_MUTE_SFT, RT5670_R_MUTE_SFT, 1, 1), SOC_DOUBLE_TLV("HP Playback Volume", RT5670_HP_VOL, RT5670_L_VOL_SFT, RT5670_R_VOL_SFT, 39, 1, out_vol_tlv), |