diff options
author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2013-06-05 09:51:31 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-05 10:46:01 -0400 |
commit | 6dc6a3f81ee66b50acee5f1aa1de2f7d2d4e55fa (patch) | |
tree | 276ac6de3e655481987c0a59c73771111ffda02a | |
parent | 71cbb77289da87e7c9625eb0788d4347eb3e732c (diff) |
ASoC: arizona: Hookup SYSCLK to inputs and noise generators
All sources and sinks should enable SYSCLK.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/wm5102.c | 11 | ||||
-rw-r--r-- | sound/soc/codecs/wm5110.c | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 9a186ff22b55..842adfdcb2a9 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
@@ -1388,10 +1388,21 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { | |||
1388 | { "OUT5L", NULL, "SYSCLK" }, | 1388 | { "OUT5L", NULL, "SYSCLK" }, |
1389 | { "OUT5R", NULL, "SYSCLK" }, | 1389 | { "OUT5R", NULL, "SYSCLK" }, |
1390 | 1390 | ||
1391 | { "IN1L", NULL, "SYSCLK" }, | ||
1392 | { "IN1R", NULL, "SYSCLK" }, | ||
1393 | { "IN2L", NULL, "SYSCLK" }, | ||
1394 | { "IN2R", NULL, "SYSCLK" }, | ||
1395 | { "IN3L", NULL, "SYSCLK" }, | ||
1396 | { "IN3R", NULL, "SYSCLK" }, | ||
1397 | |||
1391 | { "MICBIAS1", NULL, "MICVDD" }, | 1398 | { "MICBIAS1", NULL, "MICVDD" }, |
1392 | { "MICBIAS2", NULL, "MICVDD" }, | 1399 | { "MICBIAS2", NULL, "MICVDD" }, |
1393 | { "MICBIAS3", NULL, "MICVDD" }, | 1400 | { "MICBIAS3", NULL, "MICVDD" }, |
1394 | 1401 | ||
1402 | { "Noise Generator", NULL, "SYSCLK" }, | ||
1403 | { "Tone Generator 1", NULL, "SYSCLK" }, | ||
1404 | { "Tone Generator 2", NULL, "SYSCLK" }, | ||
1405 | |||
1395 | { "Noise Generator", NULL, "NOISE" }, | 1406 | { "Noise Generator", NULL, "NOISE" }, |
1396 | { "Tone Generator 1", NULL, "TONE" }, | 1407 | { "Tone Generator 1", NULL, "TONE" }, |
1397 | { "Tone Generator 2", NULL, "TONE" }, | 1408 | { "Tone Generator 2", NULL, "TONE" }, |
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index f53062f8c42e..17fdd9dbb17a 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
@@ -820,10 +820,23 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { | |||
820 | { "OUT6L", NULL, "SYSCLK" }, | 820 | { "OUT6L", NULL, "SYSCLK" }, |
821 | { "OUT6R", NULL, "SYSCLK" }, | 821 | { "OUT6R", NULL, "SYSCLK" }, |
822 | 822 | ||
823 | { "IN1L", NULL, "SYSCLK" }, | ||
824 | { "IN1R", NULL, "SYSCLK" }, | ||
825 | { "IN2L", NULL, "SYSCLK" }, | ||
826 | { "IN2R", NULL, "SYSCLK" }, | ||
827 | { "IN3L", NULL, "SYSCLK" }, | ||
828 | { "IN3R", NULL, "SYSCLK" }, | ||
829 | { "IN4L", NULL, "SYSCLK" }, | ||
830 | { "IN4R", NULL, "SYSCLK" }, | ||
831 | |||
823 | { "MICBIAS1", NULL, "MICVDD" }, | 832 | { "MICBIAS1", NULL, "MICVDD" }, |
824 | { "MICBIAS2", NULL, "MICVDD" }, | 833 | { "MICBIAS2", NULL, "MICVDD" }, |
825 | { "MICBIAS3", NULL, "MICVDD" }, | 834 | { "MICBIAS3", NULL, "MICVDD" }, |
826 | 835 | ||
836 | { "Noise Generator", NULL, "SYSCLK" }, | ||
837 | { "Tone Generator 1", NULL, "SYSCLK" }, | ||
838 | { "Tone Generator 2", NULL, "SYSCLK" }, | ||
839 | |||
827 | { "Noise Generator", NULL, "NOISE" }, | 840 | { "Noise Generator", NULL, "NOISE" }, |
828 | { "Tone Generator 1", NULL, "TONE" }, | 841 | { "Tone Generator 1", NULL, "TONE" }, |
829 | { "Tone Generator 2", NULL, "TONE" }, | 842 | { "Tone Generator 2", NULL, "TONE" }, |