aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm5110.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-12 18:59:08 -0400
committerMark Brown <broonie@linaro.org>2013-08-19 06:12:09 -0400
commit66e7aa22c751af82567f9af82fe7e1254f751870 (patch)
tree6de48cd326cf20049ce51bfe082e6f16a2c758ba /sound/soc/codecs/wm5110.c
parent3efd8a6f1a74b4bbf54c992e1cf23381c64de216 (diff)
ASoC: wm5110: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so. Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm5110.c')
-rw-r--r--sound/soc/codecs/wm5110.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 38e50c81a953..bbd64384ca1c 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -841,9 +841,6 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
841 { "Tone Generator 1", NULL, "TONE" }, 841 { "Tone Generator 1", NULL, "TONE" },
842 { "Tone Generator 2", NULL, "TONE" }, 842 { "Tone Generator 2", NULL, "TONE" },
843 843
844 { "Mic Mute Mixer", NULL, "Noise Mixer" },
845 { "Mic Mute Mixer", NULL, "Mic Mixer" },
846
847 { "AIF1 Capture", NULL, "AIF1TX1" }, 844 { "AIF1 Capture", NULL, "AIF1TX1" },
848 { "AIF1 Capture", NULL, "AIF1TX2" }, 845 { "AIF1 Capture", NULL, "AIF1TX2" },
849 { "AIF1 Capture", NULL, "AIF1TX3" }, 846 { "AIF1 Capture", NULL, "AIF1TX3" },
@@ -978,6 +975,9 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
978 ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"), 975 ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"),
979 ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"), 976 ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"),
980 977
978 ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Noise"),
979 ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Mic"),
980
981 ARIZONA_MUX_ROUTES("ASRC1L", "ASRC1L"), 981 ARIZONA_MUX_ROUTES("ASRC1L", "ASRC1L"),
982 ARIZONA_MUX_ROUTES("ASRC1R", "ASRC1R"), 982 ARIZONA_MUX_ROUTES("ASRC1R", "ASRC1R"),
983 ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), 983 ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"),