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

Commit b67005b2 authored by Shuming Fan's avatar Shuming Fan Committed by Greg Kroah-Hartman
Browse files

ASoC: rt5650: add mutex to avoid the jack detection failure 



[ Upstream commit cdba4301adda7c60a2064bf808e48fccd352aaa9 ]

This patch adds the jd_mutex to protect the jack detection control flow.
And only the headset type could check the button status.

Signed-off-by: default avatarShuming Fan <shumingf@realtek.com>
Link: https://lore.kernel.org/r/20231122100123.2831753-1-shumingf@realtek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4fece661

sound/soc/codecs/rt5645.c

+9 −1
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ struct rt5645_priv { 
	struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)];

	struct rt5645_eq_param_s *eq_param;

	struct timer_list btn_check_timer;

	struct mutex jd_mutex;



	int codec_type;

	int sysclk;
@@ -3179,6 +3180,8 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inse 
				rt5645_enable_push_button_irq(component, true);

			}

		} else {

			if (rt5645->en_button_func)

				rt5645_enable_push_button_irq(component, false);

			snd_soc_dapm_disable_pin(dapm, "Mic Det Power");

			snd_soc_dapm_sync(dapm);

			rt5645->jack_type = SND_JACK_HEADPHONE;
@@ -3259,6 +3262,8 @@ static void rt5645_jack_detect_work(struct work_struct *work) 
	if (!rt5645->component)

		return;



	mutex_lock(&rt5645->jd_mutex);



	switch (rt5645->pdata.jd_mode) {

	case 0: /* Not using rt5645 JD */

		if (rt5645->gpiod_hp_det) {
@@ -3283,7 +3288,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) 


	if (!val && (rt5645->jack_type == 0)) { /* jack in */

		report = rt5645_jack_detect(rt5645->component, 1);

	} else if (!val && rt5645->jack_type != 0) {

	} else if (!val && rt5645->jack_type == SND_JACK_HEADSET) {

		/* for push button and jack out */

		btn_type = 0;

		if (snd_soc_component_read32(rt5645->component, RT5645_INT_IRQ_ST) & 0x4) {
@@ -3339,6 +3344,8 @@ static void rt5645_jack_detect_work(struct work_struct *work) 
		rt5645_jack_detect(rt5645->component, 0);

	}



	mutex_unlock(&rt5645->jd_mutex);



	snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE);

	snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE);

	if (rt5645->en_button_func)
@@ -4041,6 +4048,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
	}

	timer_setup(&rt5645->btn_check_timer, rt5645_btn_check_callback, 0);



	mutex_init(&rt5645->jd_mutex);

	INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work);

	INIT_DELAYED_WORK(&rt5645->rcclock_work, rt5645_rcclock_work);