Merge "dsp: fix logic to send AFE calibration for TDM AFE ports"

This commit is contained in:
Linux Build Service Account 2017-09-25 06:14:20 -07:00 committed by Gerrit - the friendly Code Review server
commit 1c88acb93b

View file

@ -2644,10 +2644,9 @@ int afe_tdm_port_start(u16 port_id, struct afe_tdm_port_config *tdm_port,
this_afe.dev_acdb_id[index] = this_afe.rt_cb(port_id);
}
/* Also send the topology id here if multiple ports: */
/* Also send the topology id here: */
port_index = afe_get_port_index(port_id);
if (!(this_afe.afe_cal_mode[port_index] == AFE_CAL_MODE_NONE) &&
num_groups > 1) {
if (!(this_afe.afe_cal_mode[port_index] == AFE_CAL_MODE_NONE)) {
/* One time call: only for first time */
afe_send_custom_topology();
afe_send_port_topology_id(port_id);
@ -2709,14 +2708,12 @@ int afe_tdm_port_start(u16 port_id, struct afe_tdm_port_config *tdm_port,
ret = -EINVAL;
goto fail_cmd;
}
/* slot mapping is not need if there is only one group */
if (num_groups > 1) {
ret = afe_send_slot_mapping_cfg(&tdm_port->slot_mapping,
port_id);
if (ret < 0) {
pr_err("%s: afe send failed %d\n", __func__, ret);
goto fail_cmd;
}
ret = afe_send_slot_mapping_cfg(&tdm_port->slot_mapping,
port_id);
if (ret < 0) {
pr_err("%s: afe send failed %d\n", __func__, ret);
goto fail_cmd;
}
if (tdm_port->custom_tdm_header.header_type) {