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

Commit b08a20f5 authored by Icenowy Zheng's avatar Icenowy Zheng Committed by Mark Brown
Browse files

ASoC: sun8i-codec-analog: split out mbias 



Allwinner V3s features an analog codec without MBIAS pin.

Split out this part, in order to prepare for the V3s analog codec.

Signed-off-by: default avatarIcenowy Zheng <icenowy@aosc.xyz>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ea659a9

sound/soc/sunxi/sun8i-codec-analog.c

+30 −5
Original line number Diff line number Diff line
@@ -289,11 +289,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = { 
	/* Microphone input */

	SND_SOC_DAPM_INPUT("MIC1"),



	/* Microphone Bias */

	SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,

			    SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,

			    0, NULL, 0),



	/* Mic input path */

	SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,

			 SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0),
@@ -453,6 +448,27 @@ static int sun8i_codec_add_headphone(struct snd_soc_component *cmpnt) 
	return 0;

}



/* mbias specific widget */

static const struct snd_soc_dapm_widget sun8i_codec_mbias_widgets[] = {

	SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,

			    SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,

			    0, NULL, 0),

};



static int sun8i_codec_add_mbias(struct snd_soc_component *cmpnt)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);

	struct device *dev = cmpnt->dev;

	int ret;



	ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_mbias_widgets,

					ARRAY_SIZE(sun8i_codec_mbias_widgets));

	if (ret)

		dev_err(dev, "Failed to add MBIAS DAPM widgets: %d\n", ret);



	return ret;

}



/* hmic specific widget */

static const struct snd_soc_dapm_widget sun8i_codec_hmic_widgets[] = {

	SND_SOC_DAPM_SUPPLY("HBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
@@ -679,6 +695,7 @@ struct sun8i_codec_analog_quirks { 
	bool has_hmic;

	bool has_linein;

	bool has_lineout;

	bool has_mbias;

	bool has_mic2;

};
@@ -686,12 +703,14 @@ static const struct sun8i_codec_analog_quirks sun8i_a23_quirks = { 
	.has_headphone	= true,

	.has_hmic	= true,

	.has_linein	= true,

	.has_mbias	= true,

	.has_mic2	= true,

};



static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {

	.has_linein	= true,

	.has_lineout	= true,

	.has_mbias	= true,

	.has_mic2	= true,

};
@@ -734,6 +753,12 @@ static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt) 
			return ret;

	}



	if (quirks->has_mbias) {

		ret = sun8i_codec_add_mbias(cmpnt);

		if (ret)

			return ret;

	}



	if (quirks->has_mic2) {

		ret = sun8i_codec_add_mic2(cmpnt);

		if (ret)