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

Commit 5032dc34 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Convert WM8903 MICBIAS to a supply widget 



Also rename it to MICBIAS to reflect the pin name and help any out of tree
users notice the change.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
parent 5bbcc3c0

sound/soc/codecs/wm8903.c

+2 −2
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ SND_SOC_DAPM_OUTPUT("LON"), 
SND_SOC_DAPM_OUTPUT("ROP"),

SND_SOC_DAPM_OUTPUT("RON"),



SND_SOC_DAPM_MICBIAS("Mic Bias", WM8903_MIC_BIAS_CONTROL_0, 0, 0),

SND_SOC_DAPM_SUPPLY("MICBIAS", WM8903_MIC_BIAS_CONTROL_0, 0, 0, NULL, 0),



SND_SOC_DAPM_MUX("Left Input Mux", SND_SOC_NOPM, 0, 0, &linput_mux),

SND_SOC_DAPM_MUX("Left Input Inverting Mux", SND_SOC_NOPM, 0, 0,
@@ -947,7 +947,7 @@ SND_SOC_DAPM_SUPPLY("CLK_SYS", WM8903_CLOCK_RATES_2, 2, 0, NULL, 0), 
static const struct snd_soc_dapm_route wm8903_intercon[] = {



	{ "CLK_DSP", NULL, "CLK_SYS" },

	{ "Mic Bias", NULL, "CLK_SYS" },

	{ "MICBIAS", NULL, "CLK_SYS" },

	{ "HPL_DCS", NULL, "CLK_SYS" },

	{ "HPR_DCS", NULL, "CLK_SYS" },

	{ "LINEOUTL_DCS", NULL, "CLK_SYS" },

sound/soc/tegra/tegra_wm8903.c

+9 −9
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static const struct snd_soc_dapm_route harmony_audio_map[] = { 
	{"Int Spk", NULL, "RON"},

	{"Int Spk", NULL, "LOP"},

	{"Int Spk", NULL, "LON"},

	{"Mic Bias", NULL, "Mic Jack"},

	{"IN1L", NULL, "Mic Bias"},

	{"Mic Jack", NULL, "MICBIAS"},

	{"IN1L", NULL, "Mic Jack"},

};



static const struct snd_soc_dapm_route seaboard_audio_map[] = {
@@ -212,8 +212,8 @@ static const struct snd_soc_dapm_route seaboard_audio_map[] = { 
	{"Int Spk", NULL, "RON"},

	{"Int Spk", NULL, "LOP"},

	{"Int Spk", NULL, "LON"},

	{"Mic Bias", NULL, "Mic Jack"},

	{"IN1R", NULL, "Mic Bias"},

	{"Mic Jack", NULL, "MICBIAS"},

	{"IN1R", NULL, "Mic Jack"},

};



static const struct snd_soc_dapm_route kaen_audio_map[] = {
@@ -223,8 +223,8 @@ static const struct snd_soc_dapm_route kaen_audio_map[] = { 
	{"Int Spk", NULL, "RON"},

	{"Int Spk", NULL, "LOP"},

	{"Int Spk", NULL, "LON"},

	{"Mic Bias", NULL, "Mic Jack"},

	{"IN2R", NULL, "Mic Bias"},

	{"Mic Jack", NULL, "MICBIAS"},

	{"IN2R", NULL, "Mic Jack"},

};



static const struct snd_soc_dapm_route aebl_audio_map[] = {
@@ -232,8 +232,8 @@ static const struct snd_soc_dapm_route aebl_audio_map[] = { 
	{"Headphone Jack", NULL, "HPOUTL"},

	{"Int Spk", NULL, "LINEOUTR"},

	{"Int Spk", NULL, "LINEOUTL"},

	{"Mic Bias", NULL, "Mic Jack"},

	{"IN1R", NULL, "Mic Bias"},

	{"Mic Jack", NULL, "MICBIAS"},

	{"IN1R", NULL, "Mic Jack"},

};



static const struct snd_kcontrol_new tegra_wm8903_controls[] = {
@@ -329,7 +329,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) 
	wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,

				0);



	snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");

	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");



	return 0;

}