summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/sn95031.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-02-15 18:28:52 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-15 17:58:41 -0800
commita62ffc92e8332135c3dbc3351c7e90031830e2f7 (patch)
treed934b1518e380b070673618ba9b5aa33a1db35cd /sound/soc/codecs/sn95031.c
parent1461d0630ef74073e308a79834ba09e1bd2df08e (diff)
downloadlinux-a62ffc92e8332135c3dbc3351c7e90031830e2f7.tar.gz
linux-a62ffc92e8332135c3dbc3351c7e90031830e2f7.tar.bz2
linux-a62ffc92e8332135c3dbc3351c7e90031830e2f7.zip
ASoC: sn95031: fix the DMIC path routing
This patch makes the DMIC dynamically connect to TX Mux, earlier code had erroneously made this as static path Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Harsha Priya <priya.harsha@intel.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/sn95031.c')
-rw-r--r--sound/soc/codecs/sn95031.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 9c3db0d7b757..5eb39c7ed967 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -602,30 +602,30 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {
{ "Txpath2 Capture Route", "ADC Right", "ADC Right"},
{ "Txpath3 Capture Route", "ADC Right", "ADC Right"},
{ "Txpath4 Capture Route", "ADC Right", "ADC Right"},
- { "Txpath1 Capture Route", NULL, "DMIC1"},
- { "Txpath2 Capture Route", NULL, "DMIC1"},
- { "Txpath3 Capture Route", NULL, "DMIC1"},
- { "Txpath4 Capture Route", NULL, "DMIC1"},
- { "Txpath1 Capture Route", NULL, "DMIC2"},
- { "Txpath2 Capture Route", NULL, "DMIC2"},
- { "Txpath3 Capture Route", NULL, "DMIC2"},
- { "Txpath4 Capture Route", NULL, "DMIC2"},
- { "Txpath1 Capture Route", NULL, "DMIC3"},
- { "Txpath2 Capture Route", NULL, "DMIC3"},
- { "Txpath3 Capture Route", NULL, "DMIC3"},
- { "Txpath4 Capture Route", NULL, "DMIC3"},
- { "Txpath1 Capture Route", NULL, "DMIC4"},
- { "Txpath2 Capture Route", NULL, "DMIC4"},
- { "Txpath3 Capture Route", NULL, "DMIC4"},
- { "Txpath4 Capture Route", NULL, "DMIC4"},
- { "Txpath1 Capture Route", NULL, "DMIC5"},
- { "Txpath2 Capture Route", NULL, "DMIC5"},
- { "Txpath3 Capture Route", NULL, "DMIC5"},
- { "Txpath4 Capture Route", NULL, "DMIC5"},
- { "Txpath1 Capture Route", NULL, "DMIC6"},
- { "Txpath2 Capture Route", NULL, "DMIC6"},
- { "Txpath3 Capture Route", NULL, "DMIC6"},
- { "Txpath4 Capture Route", NULL, "DMIC6"},
+ { "Txpath1 Capture Route", "DMIC1", "DMIC1"},
+ { "Txpath2 Capture Route", "DMIC1", "DMIC1"},
+ { "Txpath3 Capture Route", "DMIC1", "DMIC1"},
+ { "Txpath4 Capture Route", "DMIC1", "DMIC1"},
+ { "Txpath1 Capture Route", "DMIC2", "DMIC2"},
+ { "Txpath2 Capture Route", "DMIC2", "DMIC2"},
+ { "Txpath3 Capture Route", "DMIC2", "DMIC2"},
+ { "Txpath4 Capture Route", "DMIC2", "DMIC2"},
+ { "Txpath1 Capture Route", "DMIC3", "DMIC3"},
+ { "Txpath2 Capture Route", "DMIC3", "DMIC3"},
+ { "Txpath3 Capture Route", "DMIC3", "DMIC3"},
+ { "Txpath4 Capture Route", "DMIC3", "DMIC3"},
+ { "Txpath1 Capture Route", "DMIC4", "DMIC4"},
+ { "Txpath2 Capture Route", "DMIC4", "DMIC4"},
+ { "Txpath3 Capture Route", "DMIC4", "DMIC4"},
+ { "Txpath4 Capture Route", "DMIC4", "DMIC4"},
+ { "Txpath1 Capture Route", "DMIC5", "DMIC5"},
+ { "Txpath2 Capture Route", "DMIC5", "DMIC5"},
+ { "Txpath3 Capture Route", "DMIC5", "DMIC5"},
+ { "Txpath4 Capture Route", "DMIC5", "DMIC5"},
+ { "Txpath1 Capture Route", "DMIC6", "DMIC6"},
+ { "Txpath2 Capture Route", "DMIC6", "DMIC6"},
+ { "Txpath3 Capture Route", "DMIC6", "DMIC6"},
+ { "Txpath4 Capture Route", "DMIC6", "DMIC6"},
/* tx path */
{ "TX1 Enable", NULL, "Txpath1 Capture Route"},