summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorDerek Chen <chenche@codeaurora.org>2016-02-23 21:16:28 -0500
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-25 16:03:51 -0700
commitdea9b1823edb63df6fba44fb73c383a8532896d8 (patch)
treeb97d19147042de002be0b0a6a6c62ad699995ae7 /sound/soc
parent57f6e452a52a5e938c08043c10561dc3aa1bb4db (diff)
ASoC: msm: qdsp6v2: Add TERT_TDM_TX_0 as an ec ref channel
Add necessary paths/dapm routes for AUDIO_REF_EC_UL1 Mux to select newly added TERT_TDM_TX_0. CRs-fixed: 981200 Change-Id: I5349598519a7889dbcc840615556bf6bf4d2e3c1 Signed-off-by: Derek Chen <chenche@codeaurora.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index cb9a23f593fe..c5181fcaf3d6 100644
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -1967,6 +1967,10 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol,
msm_route_ec_ref_rx = 17;
ec_ref_port_id = AFE_PORT_ID_QUATERNARY_MI2S_RX;
break;
+ case 18:
+ msm_route_ec_ref_rx = 18;
+ ec_ref_port_id = AFE_PORT_ID_TERTIARY_TDM_TX;
+ break;
default:
msm_route_ec_ref_rx = 0; /* NONE */
pr_err("%s EC ref rx %ld not valid\n",
@@ -1987,7 +1991,8 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX",
"TERT_MI2S_TX", "QUAT_MI2S_TX", "SEC_I2S_RX", "PROXY_RX",
"SLIM_5_RX", "SLIM_1_TX", "QUAT_TDM_TX_1",
"QUAT_TDM_RX_0", "QUAT_TDM_RX_1", "QUAT_TDM_RX_2", "SLIM_6_RX",
- "TERT_MI2S_RX", "QUAT_MI2S_RX"};
+ "TERT_MI2S_RX", "QUAT_MI2S_RX", "TERT_TDM_TX_0"};
+
static const struct soc_enum msm_route_ec_ref_rx_enum[] = {
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(ec_ref_rx), ec_ref_rx),
};
@@ -8118,6 +8123,11 @@ static const struct snd_soc_dapm_route intercon[] = {
{"AUDIO_REF_EC_UL1 MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},
{"AUDIO_REF_EC_UL1 MUX", "QUAT_MI2S_TX" , "QUAT_MI2S_TX"},
{"AUDIO_REF_EC_UL1 MUX", "SLIM_1_TX" , "SLIMBUS_1_TX"},
+ {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_TX_1" , "QUAT_TDM_TX_1"},
+ {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_0" , "QUAT_TDM_RX_0"},
+ {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_1" , "QUAT_TDM_RX_1"},
+ {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_2" , "QUAT_TDM_RX_2"},
+ {"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_TX_0" , "TERT_TDM_TX_0"},
{"AUDIO_REF_EC_UL2 MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},
{"AUDIO_REF_EC_UL2 MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},