aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-02-15 07:58:52 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-15 20:58:41 -0500
commita62ffc92e8332135c3dbc3351c7e90031830e2f7 (patch)
treed934b1518e380b070673618ba9b5aa33a1db35cd /sound
parent1461d0630ef74073e308a79834ba09e1bd2df08e (diff)
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')
-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[] = {
602 { "Txpath2 Capture Route", "ADC Right", "ADC Right"}, 602 { "Txpath2 Capture Route", "ADC Right", "ADC Right"},
603 { "Txpath3 Capture Route", "ADC Right", "ADC Right"}, 603 { "Txpath3 Capture Route", "ADC Right", "ADC Right"},
604 { "Txpath4 Capture Route", "ADC Right", "ADC Right"}, 604 { "Txpath4 Capture Route", "ADC Right", "ADC Right"},
605 { "Txpath1 Capture Route", NULL, "DMIC1"}, 605 { "Txpath1 Capture Route", "DMIC1", "DMIC1"},
606 { "Txpath2 Capture Route", NULL, "DMIC1"}, 606 { "Txpath2 Capture Route", "DMIC1", "DMIC1"},
607 { "Txpath3 Capture Route", NULL, "DMIC1"}, 607 { "Txpath3 Capture Route", "DMIC1", "DMIC1"},
608 { "Txpath4 Capture Route", NULL, "DMIC1"}, 608 { "Txpath4 Capture Route", "DMIC1", "DMIC1"},
609 { "Txpath1 Capture Route", NULL, "DMIC2"}, 609 { "Txpath1 Capture Route", "DMIC2", "DMIC2"},
610 { "Txpath2 Capture Route", NULL, "DMIC2"}, 610 { "Txpath2 Capture Route", "DMIC2", "DMIC2"},
611 { "Txpath3 Capture Route", NULL, "DMIC2"}, 611 { "Txpath3 Capture Route", "DMIC2", "DMIC2"},
612 { "Txpath4 Capture Route", NULL, "DMIC2"}, 612 { "Txpath4 Capture Route", "DMIC2", "DMIC2"},
613 { "Txpath1 Capture Route", NULL, "DMIC3"}, 613 { "Txpath1 Capture Route", "DMIC3", "DMIC3"},
614 { "Txpath2 Capture Route", NULL, "DMIC3"}, 614 { "Txpath2 Capture Route", "DMIC3", "DMIC3"},
615 { "Txpath3 Capture Route", NULL, "DMIC3"}, 615 { "Txpath3 Capture Route", "DMIC3", "DMIC3"},
616 { "Txpath4 Capture Route", NULL, "DMIC3"}, 616 { "Txpath4 Capture Route", "DMIC3", "DMIC3"},
617 { "Txpath1 Capture Route", NULL, "DMIC4"}, 617 { "Txpath1 Capture Route", "DMIC4", "DMIC4"},
618 { "Txpath2 Capture Route", NULL, "DMIC4"}, 618 { "Txpath2 Capture Route", "DMIC4", "DMIC4"},
619 { "Txpath3 Capture Route", NULL, "DMIC4"}, 619 { "Txpath3 Capture Route", "DMIC4", "DMIC4"},
620 { "Txpath4 Capture Route", NULL, "DMIC4"}, 620 { "Txpath4 Capture Route", "DMIC4", "DMIC4"},
621 { "Txpath1 Capture Route", NULL, "DMIC5"}, 621 { "Txpath1 Capture Route", "DMIC5", "DMIC5"},
622 { "Txpath2 Capture Route", NULL, "DMIC5"}, 622 { "Txpath2 Capture Route", "DMIC5", "DMIC5"},
623 { "Txpath3 Capture Route", NULL, "DMIC5"}, 623 { "Txpath3 Capture Route", "DMIC5", "DMIC5"},
624 { "Txpath4 Capture Route", NULL, "DMIC5"}, 624 { "Txpath4 Capture Route", "DMIC5", "DMIC5"},
625 { "Txpath1 Capture Route", NULL, "DMIC6"}, 625 { "Txpath1 Capture Route", "DMIC6", "DMIC6"},
626 { "Txpath2 Capture Route", NULL, "DMIC6"}, 626 { "Txpath2 Capture Route", "DMIC6", "DMIC6"},
627 { "Txpath3 Capture Route", NULL, "DMIC6"}, 627 { "Txpath3 Capture Route", "DMIC6", "DMIC6"},
628 { "Txpath4 Capture Route", NULL, "DMIC6"}, 628 { "Txpath4 Capture Route", "DMIC6", "DMIC6"},
629 629
630 /* tx path */ 630 /* tx path */
631 { "TX1 Enable", NULL, "Txpath1 Capture Route"}, 631 { "TX1 Enable", NULL, "Txpath1 Capture Route"},