aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 07:20:08 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-28 12:02:07 -0500
commit5032dc34294d1084b7367877dadb6edb2d45ad7c (patch)
tree24bcc979bf322cb4ab8ce85621b920b0facff83d /sound/soc/codecs/wm8903.c
parent5bbcc3c0d0f063318ec83146d1958acf7154c66f (diff)
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: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 5957a8b52eda..70a2268c5498 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -838,7 +838,7 @@ SND_SOC_DAPM_OUTPUT("LON"),
838SND_SOC_DAPM_OUTPUT("ROP"), 838SND_SOC_DAPM_OUTPUT("ROP"),
839SND_SOC_DAPM_OUTPUT("RON"), 839SND_SOC_DAPM_OUTPUT("RON"),
840 840
841SND_SOC_DAPM_MICBIAS("Mic Bias", WM8903_MIC_BIAS_CONTROL_0, 0, 0), 841SND_SOC_DAPM_SUPPLY("MICBIAS", WM8903_MIC_BIAS_CONTROL_0, 0, 0, NULL, 0),
842 842
843SND_SOC_DAPM_MUX("Left Input Mux", SND_SOC_NOPM, 0, 0, &linput_mux), 843SND_SOC_DAPM_MUX("Left Input Mux", SND_SOC_NOPM, 0, 0, &linput_mux),
844SND_SOC_DAPM_MUX("Left Input Inverting Mux", SND_SOC_NOPM, 0, 0, 844SND_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),
947static const struct snd_soc_dapm_route wm8903_intercon[] = { 947static const struct snd_soc_dapm_route wm8903_intercon[] = {
948 948
949 { "CLK_DSP", NULL, "CLK_SYS" }, 949 { "CLK_DSP", NULL, "CLK_SYS" },
950 { "Mic Bias", NULL, "CLK_SYS" }, 950 { "MICBIAS", NULL, "CLK_SYS" },
951 { "HPL_DCS", NULL, "CLK_SYS" }, 951 { "HPL_DCS", NULL, "CLK_SYS" },
952 { "HPR_DCS", NULL, "CLK_SYS" }, 952 { "HPR_DCS", NULL, "CLK_SYS" },
953 { "LINEOUTL_DCS", NULL, "CLK_SYS" }, 953 { "LINEOUTL_DCS", NULL, "CLK_SYS" },