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

Commit b1cd8457 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: rt286: Replace direct snd_soc_codec dapm field access 



The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm.bias_level with snd_soc_codec_get_bias_level() and replace all
other manual access to codec->dapm with snd_soc_codec_get_dapm().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ff344dcd

sound/soc/codecs/rt286.c

+17 −15
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ static int rt286_support_power_controls[] = { 


static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)

{

	struct snd_soc_dapm_context *dapm;

	unsigned int val, buf;



	*hp = false;
@@ -308,6 +309,9 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 


	if (!rt286->codec)

		return -EINVAL;



	dapm = snd_soc_codec_get_dapm(rt286->codec);



	if (rt286->pdata.cbj_en) {

		regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);

		*hp = buf & 0x80000000;
@@ -316,14 +320,11 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 
			regmap_update_bits(rt286->regmap,

				RT286_DC_GAIN, 0x200, 0x200);



			snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,

							"HV");

			snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,

							"VREF");

			snd_soc_dapm_force_enable_pin(dapm, "HV");

			snd_soc_dapm_force_enable_pin(dapm, "VREF");

			/* power LDO1 */

			snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,

							"LDO1");

			snd_soc_dapm_sync(&rt286->codec->dapm);

			snd_soc_dapm_force_enable_pin(dapm, "LDO1");

			snd_soc_dapm_sync(dapm);



			regmap_write(rt286->regmap, RT286_SET_MIC1, 0x24);

			msleep(50);
@@ -360,11 +361,11 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 
		*mic = buf & 0x80000000;

	}



	snd_soc_dapm_disable_pin(&rt286->codec->dapm, "HV");

	snd_soc_dapm_disable_pin(&rt286->codec->dapm, "VREF");

	snd_soc_dapm_disable_pin(dapm, "HV");

	snd_soc_dapm_disable_pin(dapm, "VREF");

	if (!*hp)

		snd_soc_dapm_disable_pin(&rt286->codec->dapm, "LDO1");

	snd_soc_dapm_sync(&rt286->codec->dapm);

		snd_soc_dapm_disable_pin(dapm, "LDO1");

	snd_soc_dapm_sync(dapm);



	return 0;

}
@@ -391,6 +392,7 @@ static void rt286_jack_detect_work(struct work_struct *work) 


int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);



	rt286->jack = jack;
@@ -398,7 +400,7 @@ int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) 
	if (jack) {

		/* enable IRQ */

		if (rt286->jack->status & SND_JACK_HEADPHONE)

			snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1");

			snd_soc_dapm_force_enable_pin(dapm, "LDO1");

		regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2);

		/* Send an initial empty report */

		snd_soc_jack_report(rt286->jack, rt286->jack->status,
@@ -406,9 +408,9 @@ int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) 
	} else {

		/* disable IRQ */

		regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x0);

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

		snd_soc_dapm_disable_pin(dapm, "LDO1");

	}

	snd_soc_dapm_sync(&codec->dapm);

	snd_soc_dapm_sync(dapm);



	return 0;

}
@@ -985,7 +987,7 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec, 
{

	switch (level) {

	case SND_SOC_BIAS_PREPARE:

		if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) {

		if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) {

			snd_soc_write(codec,

				RT286_SET_AUDIO_POWER, AC_PWRST_D0);

			snd_soc_update_bits(codec,