summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-16 04:28:58 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-16 04:28:57 -0800
commit63e23a6cfe95525745eb90a62aee7f3cbca78ab5 (patch)
treee842c537904c60d00450e0decc6e3c124201b271
parente638fbdb0566d81c5db6ea6f06d5f80dff504702 (diff)
parent3f8f2813212519f30d215ca847cef02960b4f2b1 (diff)
Merge "ASoC: msm: qdsp6v2: DAP: Enable non DAP modules on DAP disable"
-rw-r--r--sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c b/sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c
index 2441cabc07a7..39e7e087b3e3 100644
--- a/sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c
+++ b/sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c
@@ -998,6 +998,20 @@ static int msm_ds2_dap_handle_bypass(struct dolby_param_data *dolby_data)
copp_idx, rc);
}
}
+ /* Turn on qti modules */
+ for (j = 1; j < mod_list[0]; j++) {
+ if (!msm_ds2_dap_can_enable_module(
+ mod_list[j]) ||
+ mod_list[j] ==
+ DS2_MODULE_ID)
+ continue;
+ pr_debug("%s: param enable %d\n",
+ __func__, mod_list[j]);
+ adm_param_enable(port_id, copp_idx,
+ mod_list[j],
+ MODULE_ENABLE);
+ }
+
/* Add adm api to resend calibration on port */
rc = msm_ds2_dap_send_cal_data(i);
if (rc < 0) {