Applied "ASoC: rt5651: Remove "JD Power" dapm supply" to the asoc tree

Message ID E1erTq2-0001U3-0x@debutante
State New
Headers show
  • Applied "ASoC: rt5651: Remove "JD Power" dapm supply" to the asoc tree
Related show

Commit Message

Mark Brown March 1, 2018, 7:25 p.m.
The patch

   ASoC: rt5651: Remove "JD Power" dapm supply

has been applied to the asoc tree at 

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.


From 57d9d7c32fc24ca4de49392fec1fdd3db1f58e92 Mon Sep 17 00:00:00 2001
From: Hans de Goede <>

Date: Sun, 25 Feb 2018 11:46:54 +0100
Subject: [PATCH] ASoC: rt5651: Remove "JD Power" dapm supply

Remove the "JD power" dapm supply which gets force-enabled once when
using jack-detect and never gets disabled again.

Since the PWR_JD_M bit simply needs to be always on when using jack-detect
there is no need to have it tracked by dapm, instead we can simply set it
to 1 once when initializing the jack-detection.

Tested-by: Carlo Caione <>

Signed-off-by: Hans de Goede <>

Signed-off-by: Mark Brown <>

 sound/soc/codecs/rt5651.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 9460bdcad349..cbf9f56ecb14 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -869,10 +869,6 @@  static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = {
 			      11, 0, NULL, 0),
-	/* Input Side */
-		RT5651_PWM_JD_M_BIT, 0, NULL, 0),
 	/* micbias */
 			RT5651_PWR_LDO_BIT, 0, NULL, 0),
@@ -1616,7 +1612,10 @@  static int rt5651_set_jack(struct snd_soc_component *component,
 		return -EINVAL;
-	snd_soc_dapm_force_enable_pin(dapm, "JD Power");
+	/* Enable jack detect power */
+	snd_soc_component_update_bits(component, RT5651_PWR_ANLG2,
+		RT5651_PWR_JD_M, RT5651_PWR_JD_M);
 	snd_soc_dapm_force_enable_pin(dapm, "LDO");