diff options
| author | Ben Romberger <bromberg@codeaurora.org> | 2015-11-19 17:50:07 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:11:53 -0700 |
| commit | f72230df470dbc1069d263b4c818f707fe759b9c (patch) | |
| tree | fb2e78ae524546a451167c3f2df96d5d9d0cad79 | |
| parent | 0be39b8f3b91b0df2d2dbe75ca2123a38301560e (diff) | |
ASoC: msm: qdsp6v2: Enable AFE RTAC topology support
Populate the AFE topology for the RTAC
voice and device structures which allows
retrival of AFE topologies for RTAC
clients.
Change-Id: Ib47e6b04cdfe7146315a800a3f54f9932d54cadc
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
| -rw-r--r-- | sound/soc/msm/qdsp6v2/rtac.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/msm/qdsp6v2/rtac.c b/sound/soc/msm/qdsp6v2/rtac.c index 48137fed2b15..336899f35096 100644 --- a/sound/soc/msm/qdsp6v2/rtac.c +++ b/sound/soc/msm/qdsp6v2/rtac.c @@ -427,6 +427,8 @@ void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id, rtac_adm_data.device[i].topology_id = adm_get_topology_for_port_from_copp_id(port_id, copp_id); + rtac_adm_data.device[i].afe_topology = + afe_get_topology(port_id); rtac_adm_data.device[i].afe_port = port_id; rtac_adm_data.device[i].copp = copp_id; rtac_adm_data.device[i].app_type = app_type; @@ -440,9 +442,10 @@ void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id, rtac_adm_data.device[i].num_of_popp++].app_type = q6asm_get_asm_app_type(popp_id); - pr_debug("%s: topology = 0x%x, port_id = %d, copp_id = %d, app id = 0x%x, acdb id = %d, popp_id = %d, popp topology = 0x%x, popp app type = 0x%x\n", + pr_debug("%s: topology = 0x%x, afe_topology = 0x%x, port_id = %d, copp_id = %d, app id = 0x%x, acdb id = %d, popp_id = %d, popp topology = 0x%x, popp app type = 0x%x\n", __func__, rtac_adm_data.device[i].topology_id, + rtac_adm_data.device[i].afe_topology, rtac_adm_data.device[i].afe_port, rtac_adm_data.device[i].copp, rtac_adm_data.device[i].app_type, @@ -547,9 +550,9 @@ static void set_rtac_voice_data(int idx, u32 cvs_handle, u32 cvp_handle, rtac_voice_data.voice[idx].rx_topology_id = voice_get_topology(CVP_VOC_RX_TOPOLOGY_CAL); rtac_voice_data.voice[idx].tx_afe_topology = - afe_get_port_index(tx_afe_port); + afe_get_topology(tx_afe_port); rtac_voice_data.voice[idx].rx_afe_topology = - afe_get_port_index(rx_afe_port); + afe_get_topology(rx_afe_port); rtac_voice_data.voice[idx].tx_afe_port = tx_afe_port; rtac_voice_data.voice[idx].rx_afe_port = rx_afe_port; rtac_voice_data.voice[idx].tx_acdb_id = tx_acdb_id; |