diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-15 05:20:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-15 05:20:08 -0500 |
commit | 514918f0d1c3e7cf78fe2acbe80f7b616065e210 (patch) | |
tree | f6a918d115acf0347ee69b2b90aada657a68ef96 /sound/soc/codecs/wm5110.c | |
parent | 9450d92c8c647752586eeeb7927da8a50a691c96 (diff) | |
parent | fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 (diff) |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/wm5110.c')
-rw-r--r-- | sound/soc/codecs/wm5110.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index b67ba33546d6..f2d1094424b9 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
@@ -983,24 +983,36 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { | |||
983 | ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), | 983 | ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), |
984 | ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"), | 984 | ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"), |
985 | 985 | ||
986 | { "AEC Loopback", "HPOUT1L", "OUT1L" }, | ||
987 | { "AEC Loopback", "HPOUT1R", "OUT1R" }, | ||
986 | { "HPOUT1L", NULL, "OUT1L" }, | 988 | { "HPOUT1L", NULL, "OUT1L" }, |
987 | { "HPOUT1R", NULL, "OUT1R" }, | 989 | { "HPOUT1R", NULL, "OUT1R" }, |
988 | 990 | ||
991 | { "AEC Loopback", "HPOUT2L", "OUT2L" }, | ||
992 | { "AEC Loopback", "HPOUT2R", "OUT2R" }, | ||
989 | { "HPOUT2L", NULL, "OUT2L" }, | 993 | { "HPOUT2L", NULL, "OUT2L" }, |
990 | { "HPOUT2R", NULL, "OUT2R" }, | 994 | { "HPOUT2R", NULL, "OUT2R" }, |
991 | 995 | ||
996 | { "AEC Loopback", "HPOUT3L", "OUT3L" }, | ||
997 | { "AEC Loopback", "HPOUT3R", "OUT3R" }, | ||
992 | { "HPOUT3L", NULL, "OUT3L" }, | 998 | { "HPOUT3L", NULL, "OUT3L" }, |
993 | { "HPOUT3R", NULL, "OUT3L" }, | 999 | { "HPOUT3R", NULL, "OUT3L" }, |
994 | 1000 | ||
1001 | { "AEC Loopback", "SPKOUTL", "OUT4L" }, | ||
995 | { "SPKOUTLN", NULL, "OUT4L" }, | 1002 | { "SPKOUTLN", NULL, "OUT4L" }, |
996 | { "SPKOUTLP", NULL, "OUT4L" }, | 1003 | { "SPKOUTLP", NULL, "OUT4L" }, |
997 | 1004 | ||
1005 | { "AEC Loopback", "SPKOUTR", "OUT4R" }, | ||
998 | { "SPKOUTRN", NULL, "OUT4R" }, | 1006 | { "SPKOUTRN", NULL, "OUT4R" }, |
999 | { "SPKOUTRP", NULL, "OUT4R" }, | 1007 | { "SPKOUTRP", NULL, "OUT4R" }, |
1000 | 1008 | ||
1009 | { "AEC Loopback", "SPKDAT1L", "OUT5L" }, | ||
1010 | { "AEC Loopback", "SPKDAT1R", "OUT5R" }, | ||
1001 | { "SPKDAT1L", NULL, "OUT5L" }, | 1011 | { "SPKDAT1L", NULL, "OUT5L" }, |
1002 | { "SPKDAT1R", NULL, "OUT5R" }, | 1012 | { "SPKDAT1R", NULL, "OUT5R" }, |
1003 | 1013 | ||
1014 | { "AEC Loopback", "SPKDAT2L", "OUT6L" }, | ||
1015 | { "AEC Loopback", "SPKDAT2R", "OUT6R" }, | ||
1004 | { "SPKDAT2L", NULL, "OUT6L" }, | 1016 | { "SPKDAT2L", NULL, "OUT6L" }, |
1005 | { "SPKDAT2R", NULL, "OUT6R" }, | 1017 | { "SPKDAT2R", NULL, "OUT6R" }, |
1006 | 1018 | ||