Skip to content

Commit 47742cd

Browse files
jwrdegoedepull[bot]
authored andcommitted
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>
1 parent 5890768 commit 47742cd

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

sound/soc/codecs/rt5670.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_enum, RT5670_DIG_INF1_DATA,
631631

632632
static const struct snd_kcontrol_new rt5670_snd_controls[] = {
633633
/* Headphone Output Volume */
634-
SOC_DOUBLE("HP Playback Switch", RT5670_HP_VOL,
635-
RT5670_L_MUTE_SFT, RT5670_R_MUTE_SFT, 1, 1),
636634
SOC_DOUBLE_TLV("HP Playback Volume", RT5670_HP_VOL,
637635
RT5670_L_VOL_SFT, RT5670_R_VOL_SFT,
638636
39, 1, out_vol_tlv),

0 commit comments

Comments
 (0)