diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-25 06:14:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-25 06:14:20 -0700 |
| commit | 1c88acb93b1873b93dd70ea9efa6ac0e7e245f38 (patch) | |
| tree | 3e9f004ff6dd9f2e7dd7ba058891af37e1edd51a /dsp | |
| parent | 53a557ad4625fcb621ec15a29e8e7191af72fd21 (diff) | |
| parent | 13da482a7024da66730566a1f47d83781a535166 (diff) | |
| download | msm-extra-1c88acb93b1873b93dd70ea9efa6ac0e7e245f38.tar.gz | |
Merge "dsp: fix logic to send AFE calibration for TDM AFE ports"
Diffstat (limited to 'dsp')
| -rw-r--r-- | dsp/q6afe.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/dsp/q6afe.c b/dsp/q6afe.c index a6041b37..02891440 100644 --- a/dsp/q6afe.c +++ b/dsp/q6afe.c @@ -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) { |