* [PATCH regression fix] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
@ 2021-09-29 20:15 Hans de Goede
2021-09-30 14:58 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Hans de Goede @ 2021-09-29 20:15 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: Hans de Goede, alsa-devel, stable
Commit 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling")
replaced the nau8824_dapm_enable_pin() helper with direct calls to
snd_soc_dapm_enable_pin(), but the helper was using
snd_soc_dapm_force_enable_pin() and not forcing the MICBIAS + SAR
supplies on breaks headphone vs headset and button-press detection.
Replace the snd_soc_dapm_enable_pin() calls with
snd_soc_dapm_force_enable_pin() to fix this.
Cc: stable@vger.kernel.org
Fixes: 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
sound/soc/codecs/nau8824.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c
index cea1d43e0cb8..77f647529354 100644
--- a/sound/soc/codecs/nau8824.c
+++ b/sound/soc/codecs/nau8824.c
@@ -874,8 +874,8 @@ static void nau8824_jdet_work(struct work_struct *work)
struct regmap *regmap = nau8824->regmap;
int adc_value, event = 0, event_mask = 0;
- snd_soc_dapm_enable_pin(dapm, "MICBIAS");
- snd_soc_dapm_enable_pin(dapm, "SAR");
+ snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");
+ snd_soc_dapm_force_enable_pin(dapm, "SAR");
snd_soc_dapm_sync(dapm);
msleep(100);
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH regression fix] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
2021-09-29 20:15 [PATCH regression fix] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working Hans de Goede
@ 2021-09-30 14:58 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2021-09-30 14:58 UTC (permalink / raw)
To: Liam Girdwood, Hans de Goede; +Cc: Mark Brown, alsa-devel, stable
On Wed, 29 Sep 2021 22:15:12 +0200, Hans de Goede wrote:
> Commit 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling")
> replaced the nau8824_dapm_enable_pin() helper with direct calls to
> snd_soc_dapm_enable_pin(), but the helper was using
> snd_soc_dapm_force_enable_pin() and not forcing the MICBIAS + SAR
> supplies on breaks headphone vs headset and button-press detection.
>
> Replace the snd_soc_dapm_enable_pin() calls with
> snd_soc_dapm_force_enable_pin() to fix this.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
commit: 42871e95a3afea8956d8cc567ea725b33a837775
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH regression fix] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
@ 2021-09-30 14:58 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2021-09-30 14:58 UTC (permalink / raw)
To: Liam Girdwood, Hans de Goede; +Cc: alsa-devel, Mark Brown, stable
On Wed, 29 Sep 2021 22:15:12 +0200, Hans de Goede wrote:
> Commit 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling")
> replaced the nau8824_dapm_enable_pin() helper with direct calls to
> snd_soc_dapm_enable_pin(), but the helper was using
> snd_soc_dapm_force_enable_pin() and not forcing the MICBIAS + SAR
> supplies on breaks headphone vs headset and button-press detection.
>
> Replace the snd_soc_dapm_enable_pin() calls with
> snd_soc_dapm_force_enable_pin() to fix this.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
commit: 42871e95a3afea8956d8cc567ea725b33a837775
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-30 15:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-29 20:15 [PATCH regression fix] ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working Hans de Goede
2021-09-30 14:58 ` Mark Brown
2021-09-30 14:58 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.