Unverified Commit 1310e737 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: rt5651: Enable LDO and micbias1 supplies for jack-type detection 



To determine if a plugged in jack is a headset (speakers + mic) or
headphones (mic contact shorted to ground) we use the micbias1 OVer Current
Detect (OVCD) functionality.

For this to work we need to have a micbias current to actually cause an
overcurrent condition when headphones are plugged in, so jack-type
detection requires both the LDO and micbias1 supplies to be on.

Before this commit there were 2 issues with the handling of this:
1) The LDO supply was force-enabled twice and never disabled again even
though it only needs to be forced on when doing jack-type detection
2) micbias1 was not force-enabled, and thus may be off when doing jack-type
detection

This commit fixes both by force-enabling the LDO and micbias1 supplies
before checking for an overcurrent condition and disabling them afterwards.

Note that both supplies will still get turned on normally (and OVCD will
protect against overcurrent) when the micbias1 is enabled normally because
the user has activated a sound stream recording from the mic.

Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 57d9d7c3

sound/soc/codecs/rt5651.c

+24 −8
Original line number Diff line number Diff line
@@ -1561,6 +1561,28 @@ static int rt5651_set_bias_level(struct snd_soc_component *component, 
	return 0;

}



static void rt5651_enable_micbias1_for_ovcd(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);



	snd_soc_dapm_mutex_lock(dapm);

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "LDO");

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "micbias1");

	snd_soc_dapm_sync_unlocked(dapm);

	snd_soc_dapm_mutex_unlock(dapm);

}



static void rt5651_disable_micbias1_for_ovcd(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);



	snd_soc_dapm_mutex_lock(dapm);

	snd_soc_dapm_disable_pin_unlocked(dapm, "micbias1");

	snd_soc_dapm_disable_pin_unlocked(dapm, "LDO");

	snd_soc_dapm_sync_unlocked(dapm);

	snd_soc_dapm_mutex_unlock(dapm);

}



static irqreturn_t rt5651_irq(int irq, void *data)

{

	struct rt5651_priv *rt5651 = data;
@@ -1574,7 +1596,6 @@ static irqreturn_t rt5651_irq(int irq, void *data) 
static int rt5651_set_jack(struct snd_soc_component *component,

			   struct snd_soc_jack *hp_jack, void *data)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);

	int ret;
@@ -1616,9 +1637,6 @@ static int rt5651_set_jack(struct snd_soc_component *component, 
	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");

	snd_soc_dapm_sync(dapm);



	snd_soc_component_update_bits(component, RT5651_MICBIAS, 0x38, 0x38);



	rt5651->hp_jack = hp_jack;
@@ -1819,13 +1837,10 @@ static const struct dmi_system_id rt5651_quirk_table[] = { 


static int rt5651_jack_detect(struct snd_soc_component *component, int jack_insert)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	int jack_type;



	if (jack_insert) {

		snd_soc_dapm_force_enable_pin(dapm, "LDO");

		snd_soc_dapm_sync(dapm);



		rt5651_enable_micbias1_for_ovcd(component);

		snd_soc_component_update_bits(component, RT5651_MICBIAS,

				    RT5651_MIC1_OVCD_MASK |

				    RT5651_MIC1_OVTH_MASK |
@@ -1842,6 +1857,7 @@ static int rt5651_jack_detect(struct snd_soc_component *component, int jack_inse 
			jack_type = SND_JACK_HEADSET;

		snd_soc_component_update_bits(component, RT5651_IRQ_CTRL2,

				    RT5651_MB1_OC_CLR, 0);

		rt5651_disable_micbias1_for_ovcd(component);

	} else { /* jack out */

		jack_type = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE