Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0cc3f16 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8994: Allow a delay between jack insertion and microphone detect 



This can be used to provide some additional settling time to ensure that
we don't start microphone detection while the microphone pin is connected
to one of the headphone pins.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ddffeb8c

include/linux/mfd/wm8994/pdata.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,11 @@ struct wm8994_pdata { 
        unsigned int lineout1fb:1;

        unsigned int lineout1fb:1;

        unsigned int lineout2fb:1;

        unsigned int lineout2fb:1;





	/* Delay between detecting a jack and starting microphone

	 * detect (specified in ms)

	 */

	int micdet_delay;



	/* IRQ for microphone detection if brought out directly as a

	/* IRQ for microphone detection if brought out directly as a

	 * signal.

	 * signal.

	 */

	 */

sound/soc/codecs/wm8994.c

+55 −19
Original line number Original line Diff line number Diff line
@@ -3470,11 +3470,46 @@ static void wm8958_default_micdet(u16 status, void *data) 
	}

	}

}

}





/* Deferred mic detection to allow for extra settling time */

static void wm1811_mic_work(struct work_struct *work)

{

	struct wm8994_priv *wm8994 = container_of(work, struct wm8994_priv,

						  mic_work.work);

	struct snd_soc_codec *codec = wm8994->hubs.codec;



	pm_runtime_get_sync(codec->dev);



	/* If required for an external cap force MICBIAS on */

	if (wm8994->pdata->jd_ext_cap) {

		snd_soc_dapm_force_enable_pin(&codec->dapm,

					      "MICBIAS2");

		snd_soc_dapm_sync(&codec->dapm);

	}



	mutex_lock(&wm8994->accdet_lock);



	dev_dbg(codec->dev, "Starting mic detection\n");



	/*

	 * Start off measument of microphone impedence to find out

	 * what's actually there.

	 */

	wm8994->mic_detecting = true;

	wm1811_jackdet_set_mode(codec, WM1811_JACKDET_MODE_MIC);



	snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,

			    WM8958_MICD_ENA, WM8958_MICD_ENA);



	mutex_unlock(&wm8994->accdet_lock);



	pm_runtime_put(codec->dev);

}



static irqreturn_t wm1811_jackdet_irq(int irq, void *data)

static irqreturn_t wm1811_jackdet_irq(int irq, void *data)

{

{

	struct wm8994_priv *wm8994 = data;

	struct wm8994_priv *wm8994 = data;

	struct snd_soc_codec *codec = wm8994->hubs.codec;

	struct snd_soc_codec *codec = wm8994->hubs.codec;

	int reg;

	int reg, delay;

	bool present;

	bool present;





	pm_runtime_get_sync(codec->dev);

	pm_runtime_get_sync(codec->dev);
@@ -3505,18 +3540,14 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) 
		snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,

		snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,

				    WM1811_JACKDET_DB, 0);

				    WM1811_JACKDET_DB, 0);





		/*

		delay = wm8994->pdata->micdet_delay;

		 * Start off measument of microphone impedence to find

		schedule_delayed_work(&wm8994->mic_work,

		 * out what's actually there.

				      msecs_to_jiffies(delay));

		 */

		wm8994->mic_detecting = true;

		wm1811_jackdet_set_mode(codec, WM1811_JACKDET_MODE_MIC);



		snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,

				    WM8958_MICD_ENA, WM8958_MICD_ENA);

	} else {

	} else {

		dev_dbg(codec->dev, "Jack not detected\n");

		dev_dbg(codec->dev, "Jack not detected\n");





		cancel_delayed_work_sync(&wm8994->mic_work);



		snd_soc_update_bits(codec, WM8958_MICBIAS2,

		snd_soc_update_bits(codec, WM8958_MICBIAS2,

				    WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);

				    WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);
@@ -3533,14 +3564,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) 




	mutex_unlock(&wm8994->accdet_lock);

	mutex_unlock(&wm8994->accdet_lock);





	/* If required for an external cap force MICBIAS on */

	/* Turn off MICBIAS if it was on for an external cap */

	if (wm8994->pdata->jd_ext_cap) {

	if (wm8994->pdata->jd_ext_cap && !present)

		if (present)

			snd_soc_dapm_force_enable_pin(&codec->dapm,

						      "MICBIAS2");

		else

		snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS2");

		snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS2");

	}





	if (present)

	if (present)

		snd_soc_jack_report(wm8994->micdet[0].jack,

		snd_soc_jack_report(wm8994->micdet[0].jack,
@@ -3763,10 +3789,20 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
	snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);

	snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);





	mutex_init(&wm8994->accdet_lock);

	mutex_init(&wm8994->accdet_lock);

	INIT_DELAYED_WORK(&wm8994->mic_work, wm8994_mic_work);

	INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap,

	INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap,

			  wm1811_jackdet_bootstrap);

			  wm1811_jackdet_bootstrap);





	switch (control->type) {

	case WM8994:

		INIT_DELAYED_WORK(&wm8994->mic_work, wm8994_mic_work);

		break;

	case WM1811:

		INIT_DELAYED_WORK(&wm8994->mic_work, wm1811_mic_work);

		break;

	default:

		break;

	}



	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)

	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)

		init_completion(&wm8994->fll_locked[i]);

		init_completion(&wm8994->fll_locked[i]);