summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-18 15:05:53 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-22 10:37:49 -0800
commitcea2bc50a3dd88e43be2e926a9ae31ab7816bf2d (patch)
tree4da524ce5181331639fa7aba6995d4c5240c1f51 /sound
parent8ceed344afab2d89516e6d52634ad81920762993 (diff)
downloadlinux-stable-cea2bc50a3dd88e43be2e926a9ae31ab7816bf2d.tar.gz
linux-stable-cea2bc50a3dd88e43be2e926a9ae31ab7816bf2d.tar.bz2
linux-stable-cea2bc50a3dd88e43be2e926a9ae31ab7816bf2d.zip
ASoC: Hook wm_hubs micbiases up to CLK_SYS
The microphone detection functionality requires a clock to work. In any non-detection case where the MICBIAS is enabled CLK_SYS will be needed anyway so there is no negative impact on power consumption. 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/wm_hubs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 613df5db0b32..516892706063 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -674,6 +674,9 @@ SND_SOC_DAPM_OUTPUT("LINEOUT2N"),
};
static const struct snd_soc_dapm_route analogue_routes[] = {
+ { "MICBIAS1", NULL, "CLK_SYS" },
+ { "MICBIAS2", NULL, "CLK_SYS" },
+
{ "IN1L PGA", "IN1LP Switch", "IN1LP" },
{ "IN1L PGA", "IN1LN Switch", "IN1LN" },