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

Commit b8b96220 authored by Dechen Chai's avatar Dechen Chai Committed by Gerrit - the friendly Code Review server
Browse files

soc: wsa881x: move analog init complete flag 



move judging analog init complete flag to the beginning of
wsa881x_probe function.Avoid processing the wsa component
until wsa analog client init complete.

Change-Id: I606d3378e8533572f3949026565f4aea9e90ea47
Signed-off-by: default avatarDechen Chai <quic_dchai@quicinc.com>
parent 4baeac42

asoc/codecs/wsa881x-analog.c

+13 −11
Original line number Diff line number Diff line
@@ -1194,17 +1194,7 @@ static int wsa881x_probe(struct snd_soc_component *component) 
			"client failed\n", __func__);

		return ret;

	}

	mutex_init(&wsa_pdata[wsa881x_index].bg_lock);

	mutex_init(&wsa_pdata[wsa881x_index].res_lock);

	snprintf(wsa_pdata[wsa881x_index].tz_pdata.name, 100, "%s",

		wsa_tz_names[wsa881x_index]);

	wsa_pdata[wsa881x_index].component = component;

	wsa_pdata[wsa881x_index].spk_pa_gain = SPK_GAIN_12DB;

	wsa_pdata[wsa881x_index].component = component;

	wsa_pdata[wsa881x_index].tz_pdata.component = component;

	wsa_pdata[wsa881x_index].tz_pdata.wsa_temp_reg_read =

						wsa881x_temp_reg_read;

	snd_soc_component_set_drvdata(component, &wsa_pdata[wsa881x_index]);



	while (retry) {

		if (wsa_pdata[wsa881x_index].regmap_flag)

			break;
@@ -1216,6 +1206,18 @@ static int wsa881x_probe(struct snd_soc_component *component) 
				"analog slave not initilized\n", __func__);

		return -EPROBE_DEFER;

	}



	mutex_init(&wsa_pdata[wsa881x_index].bg_lock);

	mutex_init(&wsa_pdata[wsa881x_index].res_lock);

	snprintf(wsa_pdata[wsa881x_index].tz_pdata.name, 100, "%s",

		wsa_tz_names[wsa881x_index]);

	wsa_pdata[wsa881x_index].component = component;

	wsa_pdata[wsa881x_index].spk_pa_gain = SPK_GAIN_12DB;

	wsa_pdata[wsa881x_index].component = component;

	wsa_pdata[wsa881x_index].tz_pdata.component = component;

	wsa_pdata[wsa881x_index].tz_pdata.wsa_temp_reg_read =

						wsa881x_temp_reg_read;

	snd_soc_component_set_drvdata(component, &wsa_pdata[wsa881x_index]);

	wsa881x_init_thermal(&wsa_pdata[wsa881x_index].tz_pdata);

	INIT_DELAYED_WORK(&wsa_pdata[wsa881x_index].ocp_ctl_work,

				wsa881x_ocp_ctl_work);