ASoC: Convert WM8962 MICBIAS to a supply widget
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 15:22:48 +0000 (16:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 15:59:43 +0000 (16:59 +0100)
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8962.c
sound/soc/samsung/speyside_wm8962.c

index d26ec6daec03e0ab9a3ca973a9fbf640c73f8aa7..bc6bdde3019f8d8205ed599e0a0110f5b523abe5 100644 (file)
@@ -2667,7 +2667,7 @@ SND_SOC_DAPM_INPUT("IN4R"),
 SND_SOC_DAPM_INPUT("Beep"),
 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("SYSCLK", WM8962_CLOCKING2, 5, 0, sysclk_event,
index 98b28eac412075c7edf97cfc616515a108d9e040..35539eb8fa0995fff0d4b3529d202b339e6dec42 100644 (file)
@@ -152,12 +152,12 @@ static struct snd_soc_dapm_route audio_paths[] = {
        { "Main Speaker", NULL, "SPKOUTL" },
        { "Main Speaker", NULL, "SPKOUTR" },
 
-       { "MICBIAS", NULL, "Headset Mic" },
-       { "IN4L", NULL, "MICBIAS" },
-       { "IN4R", NULL, "MICBIAS" },
+       { "Headset Mic", NULL, "MICBIAS" },
+       { "IN4L", NULL, "Headset Mic" },
+       { "IN4R", NULL, "Headset Mic" },
 
-       { "MICBIAS", NULL, "DMIC" },
-       { "DMICDAT", NULL, "MICBIAS" },
+       { "DMIC", NULL, "MICBIAS" },
+       { "DMICDAT", NULL, "DMIC" },
 };
 
 static struct snd_soc_jack speyside_wm8962_headset;