OSDN Git Service

ASoC: wm8997: Add inputs for noise and mic mixers
authorMark Brown <broonie@linaro.org>
Mon, 12 Aug 2013 22:59:19 +0000 (23:59 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 19 Aug 2013 10:12:09 +0000 (11:12 +0100)
The noise and mic mixer inputs were not connected, do so.

Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/wm8997.c

index 0a43bac..6ec3de3 100644 (file)
@@ -774,9 +774,6 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
        { "Tone Generator 1", NULL, "TONE" },
        { "Tone Generator 2", NULL, "TONE" },
 
-       { "Mic Mute Mixer", NULL, "Noise Mixer" },
-       { "Mic Mute Mixer", NULL, "Mic Mixer" },
-
        { "AIF1 Capture", NULL, "AIF1TX1" },
        { "AIF1 Capture", NULL, "AIF1TX2" },
        { "AIF1 Capture", NULL, "AIF1TX3" },
@@ -886,6 +883,9 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
        ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"),
        ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"),
 
+       ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Noise"),
+       ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Mic"),
+
        ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"),
        ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC2INT2"),