Skip to contentSkip to conversation

ASoC: Convert WM8903 MICBIAS to a supply widget

PATCH In review Mark Brown 2 participants 4 messages Nov 27, 2011 – Nov 28, 2011

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 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.

---
 sound/soc/codecs/wm8903.c      |    4 ++--
 sound/soc/tegra/tegra_wm8903.c |   18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
sound/soc/codecs/wm8903.c +2 -2
index 0cf78c1..12dae43 100644
@@ -843,7 +843,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,
@@ -952,7 +952,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
index b260f54..2f5b107 100644
@@ -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;
 }
Signature · 1 line
1.7.7.3
Acked-by on v1 1/1
#1 lore raw

Mark Brown wrote at Sunday, November 27, 2011 5:22 AM:

Quoted 2 lines

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

...

Quoted 1 line
sound/soc/codecs/wm8903.c +0 -0

...

sound/soc/codecs/wm8903.c SND_SOC_DAPM_OUTPUT("LON"), · line 846

Quoted 2 lines
sound/soc/codecs/wm8903.c +1 -1
-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),

For my education, why is this better modeled as a supply instead of a mic bias? Thanks.

Signature · 1 line
nvpublic
author
#2 lore raw
Quoted 7 lines · Stephen Warren

Mark Brown wrote at Sunday, November 27, 2011 5:22 AM:

sound/soc/codecs/wm8903.c SND_SOC_DAPM_OUTPUT("LON"), · line 846

Quoted 2 lines
sound/soc/codecs/wm8903.c +1 -1
-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),

For my education, why is this better modeled as a supply instead of a mic bias? Thanks.

The wiring in the DAPM map is *much* more comprehensible.

author
#3 lore raw
Quoted 10 lines · Mark Brown
Quoted 7 lines · Stephen Warren

Mark Brown wrote at Sunday, November 27, 2011 5:22 AM:

sound/soc/codecs/wm8903.c SND_SOC_DAPM_OUTPUT("LON"), · line 846

Quoted 2 lines
sound/soc/codecs/wm8903.c +1 -1
-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),

For my education, why is this better modeled as a supply instead of a mic bias? Thanks.

The wiring in the DAPM map is *much* more comprehensible.

Oh, and the other thing is that it means that your device tree wiring doesn't need to do any Linux-specific stuff to do with the funny way the widgets needed to be wired up or jump through hoops otherwise and can just talk about the pin being connected.