aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-12 18:59:19 -0400
committerMark Brown <broonie@linaro.org>2013-08-19 06:12:09 -0400
commitc5efb38a1354890297aed2a7e197ec5b23ce966a (patch)
tree932e46263ea87080da110e670f1c4068df21c292
parent66e7aa22c751af82567f9af82fe7e1254f751870 (diff)
ASoC: wm8997: 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>
-rw-r--r--sound/soc/codecs/wm8997.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 0a43bac2f4e3..6ec3de3efa4f 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -774,9 +774,6 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
774 { "Tone Generator 1", NULL, "TONE" }, 774 { "Tone Generator 1", NULL, "TONE" },
775 { "Tone Generator 2", NULL, "TONE" }, 775 { "Tone Generator 2", NULL, "TONE" },
776 776
777 { "Mic Mute Mixer", NULL, "Noise Mixer" },
778 { "Mic Mute Mixer", NULL, "Mic Mixer" },
779
780 { "AIF1 Capture", NULL, "AIF1TX1" }, 777 { "AIF1 Capture", NULL, "AIF1TX1" },
781 { "AIF1 Capture", NULL, "AIF1TX2" }, 778 { "AIF1 Capture", NULL, "AIF1TX2" },
782 { "AIF1 Capture", NULL, "AIF1TX3" }, 779 { "AIF1 Capture", NULL, "AIF1TX3" },
@@ -886,6 +883,9 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
886 ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"), 883 ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"),
887 ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"), 884 ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"),
888 885
886 ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Noise"),
887 ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Mic"),
888
889 ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"), 889 ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"),
890 ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC2INT2"), 890 ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC2INT2"),
891 891