Skip to content

Commit

Permalink
ASoC: Convert WM8962 MICBIAS to a supply widget
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Sep 23, 2011
1 parent 3f7d55a commit 086d7f8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions sound/soc/samsung/speyside_wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 086d7f8

Please sign in to comment.