Commit 086d7f80 authored by Mark Brown's avatar Mark Brown

ASoC: Convert WM8962 MICBIAS to a supply widget

A supply widget is generally clearer than a MICBIAS widget and a mic bias
is just a type of supply so use a supply widget for the MICBIAS. This also
avoids confusion with the routing when connected to multiple inputs.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3f7d55a1
...@@ -2667,7 +2667,7 @@ SND_SOC_DAPM_INPUT("IN4R"), ...@@ -2667,7 +2667,7 @@ SND_SOC_DAPM_INPUT("IN4R"),
SND_SOC_DAPM_INPUT("Beep"), SND_SOC_DAPM_INPUT("Beep"),
SND_SOC_DAPM_INPUT("DMICDAT"), SND_SOC_DAPM_INPUT("DMICDAT"),
SND_SOC_DAPM_MICBIAS("MICBIAS", WM8962_PWR_MGMT_1, 1, 0), SND_SOC_DAPM_SUPPLY("MICBIAS", WM8962_PWR_MGMT_1, 1, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("Class G", WM8962_CHARGE_PUMP_B, 0, 1, NULL, 0), SND_SOC_DAPM_SUPPLY("Class G", WM8962_CHARGE_PUMP_B, 0, 1, NULL, 0),
SND_SOC_DAPM_SUPPLY("SYSCLK", WM8962_CLOCKING2, 5, 0, sysclk_event, SND_SOC_DAPM_SUPPLY("SYSCLK", WM8962_CLOCKING2, 5, 0, sysclk_event,
......
...@@ -152,12 +152,12 @@ static struct snd_soc_dapm_route audio_paths[] = { ...@@ -152,12 +152,12 @@ static struct snd_soc_dapm_route audio_paths[] = {
{ "Main Speaker", NULL, "SPKOUTL" }, { "Main Speaker", NULL, "SPKOUTL" },
{ "Main Speaker", NULL, "SPKOUTR" }, { "Main Speaker", NULL, "SPKOUTR" },
{ "MICBIAS", NULL, "Headset Mic" }, { "Headset Mic", NULL, "MICBIAS" },
{ "IN4L", NULL, "MICBIAS" }, { "IN4L", NULL, "Headset Mic" },
{ "IN4R", NULL, "MICBIAS" }, { "IN4R", NULL, "Headset Mic" },
{ "MICBIAS", NULL, "DMIC" }, { "DMIC", NULL, "MICBIAS" },
{ "DMICDAT", NULL, "MICBIAS" }, { "DMICDAT", NULL, "DMIC" },
}; };
static struct snd_soc_jack speyside_wm8962_headset; static struct snd_soc_jack speyside_wm8962_headset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment