summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-21 17:53:38 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-13 10:36:57 +0100
commit821f4206c4f568bf43e30f1ae5619868fa76413a (patch)
tree1165eb0ac20fe93e02e943cf78daa785e587b285 /sound
parent0afe6b901e432bfd93eca9aefdd2ec537b27d1d3 (diff)
downloadlinux-3.10-821f4206c4f568bf43e30f1ae5619868fa76413a.tar.gz
linux-3.10-821f4206c4f568bf43e30f1ae5619868fa76413a.tar.bz2
linux-3.10-821f4206c4f568bf43e30f1ae5619868fa76413a.zip
ASoC: Add WM8962 microphone bias control
We unconditionally require SYSCLK since while only microphone detection specifically requires SYSCLK any actual use case would enable it via some other means but microphone detection may have nothing active other than the bias itself. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e5009d01108..894d0cd3aa9 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2566,6 +2566,8 @@ static const struct snd_soc_dapm_route wm8962_intercon[] = {
{ "MIXINR", "IN3R Switch", "IN3R" },
{ "MIXINR", "PGA Switch", "INPGAR" },
+ { "MICBIAS", NULL, "SYSCLK" },
+
{ "ADCL", NULL, "SYSCLK" },
{ "ADCL", NULL, "TOCLK" },
{ "ADCL", NULL, "MIXINL" },