ASoC: msm: 8960: make dmic6 micbias arrangement as default
There is digital mic connected to DMIC6 input of tabla only on
CDP and Liquid. Digital mic is powered by micbias 4 on both targets
Move routing entry to common routing table.
Change-Id: Id97d23652ea69691522b97558ba848af13d0ce39
Signed-off-by: Patrick Lai <plai@codeaurora.org>
diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c
index 548b834..bbb0789 100644
--- a/sound/soc/msm/msm8960.c
+++ b/sound/soc/msm/msm8960.c
@@ -447,11 +447,8 @@
{"DMIC5", NULL, "MIC BIAS4 External"},
{"MIC BIAS4 External", NULL, "Digital Mic5"},
-};
-
-static const struct snd_soc_dapm_route cdp_audio_map[] = {
- /** Digital Mic GM4 on CDP mainboard.
- * Connected to DMIC6 input on Tabla codec.
+ /* Tabla digital Mic6 - back bottom digital Mic on Liquid and
+ * bottom mic on CDP. FLUID/MTP do not have dmic6 installed.
*/
{"DMIC6", NULL, "MIC BIAS4 External"},
{"MIC BIAS4 External", NULL, "Digital Mic6"},
@@ -584,16 +581,6 @@
snd_soc_dapm_add_routes(dapm, common_audio_map,
ARRAY_SIZE(common_audio_map));
- if (machine_is_msm8960_cdp())
- snd_soc_dapm_add_routes(dapm, cdp_audio_map,
- ARRAY_SIZE(cdp_audio_map));
- else if (machine_is_msm8960_mtp())
- snd_soc_dapm_add_routes(dapm, cdp_audio_map,
- ARRAY_SIZE(cdp_audio_map));
- else if (machine_is_msm8960_fluid())
- snd_soc_dapm_add_routes(dapm, cdp_audio_map,
- ARRAY_SIZE(cdp_audio_map));
-
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
snd_soc_dapm_sync(dapm);