ASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096

Added DTMF mixer routing for QUAT_TDM_RX2 for automotive. Also added
the DTMF front-end dai to apq8096 driver.

Change-Id: I3652efd939774ff8cb7c40445747f0edbf6b3c7f
Signed-off-by: Timothy Sham <tsham@codeaurora.org>

diff --git a/sound/soc/msm/apq8096-auto.c b/sound/soc/msm/apq8096-auto.c
index 0de8b02..a0c5ef0 100644 (file)
--- a/sound/soc/msm/apq8096-auto.c
+++ b/sound/soc/msm/apq8096-auto.c
@@ -5699,6 +5699,22 @@ static struct snd_soc_dai_link apq8096_auto_fe_dai_links[] = {
                .ignore_pmdown_time = 1,
                .codec_dai_name = "snd-soc-dummy-dai",
                .codec_name = "snd-soc-dummy",
+       },
+       {
+               .name = "DTMF RX Hostless",
+               .stream_name = "DTMF RX Hostless",
+               .cpu_dai_name = "DTMF_RX_HOSTLESS",
+               .platform_name = "msm-pcm-dtmf",
+               .dynamic = 1,
+               .dpcm_playback = 1,
+               .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+                           SND_SOC_DPCM_TRIGGER_POST},
+               .no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
+               .ignore_suspend = 1,
+               .ignore_pmdown_time = 1,
+               .codec_dai_name = "snd-soc-dummy-dai",
+               .codec_name = "snd-soc-dummy",
+               .be_id = MSM_FRONTEND_DAI_DTMF_RX,
        }
 };
 

diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index 8a28c4f..4e4970b 100644 (file)
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -8916,6 +8916,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_voice_mixer_controls[] = {
        SOC_SINGLE_EXT("VoiceMMode1", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
        MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0, msm_routing_get_voice_mixer,
        msm_routing_put_voice_mixer),
+       SOC_SINGLE_EXT("DTMF", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
+       MSM_FRONTEND_DAI_DTMF_RX, 1, 0, msm_routing_get_voice_mixer,
+       msm_routing_put_voice_mixer),
 };
 
 static const struct snd_kcontrol_new stub_rx_mixer_controls[] = {
@@ -14954,6 +14957,7 @@ static const struct snd_soc_dapm_route intercon[] = {
        {"QUIN_MI2S_RX", NULL, "QUIN_MI2S_RX_Voice Mixer"},
 
        {"QUAT_TDM_RX_2_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},
+       {"QUAT_TDM_RX_2_Voice Mixer", "DTMF", "DTMF_DL_HL"},
        {"QUAT_TDM_RX_2", NULL, "QUAT_TDM_RX_2_Voice Mixer"},
 
        {"VOC_EXT_EC MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},