diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-22 08:33:30 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-22 08:33:29 -0800 |
| commit | b9d2af1601b29b7c263ad807447ec148f36797f3 (patch) | |
| tree | 8748c029a43ce8fa8f3f6920428d7200572fcf15 /sound/soc | |
| parent | 201b38a555bd4f2034e0bde307715de05f69f123 (diff) | |
| parent | 477bfdf516dde444f47590d1e1670a4c9aa388da (diff) | |
Merge "ASoC: msm: Extend ec ref channel with TDM_RX ports"
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c | 55 |
1 files changed, 54 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 d0dabcb4e337..b0843bca62bf 100644 --- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c @@ -3807,6 +3807,46 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, msm_route_ec_ref_rx = 22; ec_ref_port_id = AFE_PORT_ID_INT3_MI2S_TX; break; + case 23: + msm_route_ec_ref_rx = 23; + ec_ref_port_id = AFE_PORT_ID_TERTIARY_TDM_RX; + break; + case 24: + msm_route_ec_ref_rx = 24; + ec_ref_port_id = AFE_PORT_ID_TERTIARY_TDM_RX_1; + break; + case 25: + msm_route_ec_ref_rx = 25; + ec_ref_port_id = AFE_PORT_ID_TERTIARY_TDM_RX_2; + break; + case 26: + msm_route_ec_ref_rx = 26; + ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_RX; + break; + case 27: + msm_route_ec_ref_rx = 27; + ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_RX_1; + break; + case 28: + msm_route_ec_ref_rx = 28; + ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_RX_2; + break; + case 29: + msm_route_ec_ref_rx = 29; + ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_RX; + break; + case 30: + msm_route_ec_ref_rx = 30; + ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_RX_1; + break; + case 31: + msm_route_ec_ref_rx = 31; + ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_RX_2; + break; + case 32: + msm_route_ec_ref_rx = 32; + ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_RX_3; + break; default: msm_route_ec_ref_rx = 0; /* NONE */ pr_err("%s EC ref rx %ld not valid\n", @@ -3829,7 +3869,10 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_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_TDM_TX_0", "USB_AUDIO_RX", - "INT0_MI2S_RX", "INT4_MI2S_RX", "INT3_MI2S_TX"}; + "INT0_MI2S_RX", "INT4_MI2S_RX", "INT3_MI2S_TX", "TERT_TDM_RX_0", + "TERT_TDM_RX_1", "TERT_TDM_RX_2", "SEC_TDM_RX_0", "SEC_TDM_RX_1", + "SEC_TDM_RX_2", "PRI_TDM_RX_0", "PRI_TDM_RX_1", "PRI_TDM_RX_2", + "PRI_TDM_RX_3"}; static const struct soc_enum msm_route_ec_ref_rx_enum[] = { SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(ec_ref_rx), ec_ref_rx), @@ -15036,6 +15079,16 @@ static const struct snd_soc_dapm_route intercon[] = { {"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_UL1 MUX", "TERT_TDM_RX_0", "TERT_TDM_RX_0"}, + {"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_RX_1", "TERT_TDM_RX_1"}, + {"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_RX_2", "TERT_TDM_RX_2"}, + {"AUDIO_REF_EC_UL1 MUX", "SEC_TDM_RX_0", "SEC_TDM_RX_0"}, + {"AUDIO_REF_EC_UL1 MUX", "SEC_TDM_RX_1", "SEC_TDM_RX_1"}, + {"AUDIO_REF_EC_UL1 MUX", "SEC_TDM_RX_2", "SEC_TDM_RX_2"}, + {"AUDIO_REF_EC_UL1 MUX", "PRI_TDM_RX_0", "PRI_TDM_RX_0"}, + {"AUDIO_REF_EC_UL1 MUX", "PRI_TDM_RX_1", "PRI_TDM_RX_1"}, + {"AUDIO_REF_EC_UL1 MUX", "PRI_TDM_RX_2", "PRI_TDM_RX_2"}, + {"AUDIO_REF_EC_UL1 MUX", "PRI_TDM_RX_3", "PRI_TDM_RX_3"}, {"AUDIO_REF_EC_UL2 MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"}, {"AUDIO_REF_EC_UL2 MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"}, |