diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-20 19:31:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-20 19:31:50 -0700 |
| commit | e1c2b1f918f43b67dc702bb1e28bcbbbcaeed1da (patch) | |
| tree | a53d9093293d24a4a7a022c52d47ddb36e699ef4 | |
| parent | d803000f57f56ef6eededdc8055384855c938964 (diff) | |
| parent | 125ff102eb89d6bc9301f842afa9a2201cd49040 (diff) | |
Merge "ASoC: msm: qdsp6v2: return the proper LPASS status"
| -rw-r--r-- | include/sound/q6core.h | 4 | ||||
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6core.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/sound/q6core.h b/include/sound/q6core.h index e70e4ba9b968..148df25cbd51 100644 --- a/include/sound/q6core.h +++ b/include/sound/q6core.h @@ -19,8 +19,10 @@ #define AVCS_CMD_ADSP_EVENT_GET_STATE 0x0001290C #define AVCS_CMDRSP_ADSP_EVENT_GET_STATE 0x0001290D +#define AVCS_SERVICES_AND_STATIC_MODULES_READY 0x1 +#define AVCS_SERVICE_AND_ALL_MODULES_READY 0x5 -bool q6core_is_adsp_ready(void); +int q6core_is_adsp_ready(void); int q6core_add_remove_pool_pages(phys_addr_t buf_add, uint32_t bufsz, uint32_t mempool_id, bool add_pages); diff --git a/sound/soc/msm/qdsp6v2/q6core.c b/sound/soc/msm/qdsp6v2/q6core.c index ec018c24591f..d736af0c35b0 100644 --- a/sound/soc/msm/qdsp6v2/q6core.c +++ b/sound/soc/msm/qdsp6v2/q6core.c @@ -636,10 +636,10 @@ uint32_t core_set_dolby_manufacturer_id(int manufacturer_id) return rc; } -bool q6core_is_adsp_ready(void) +int q6core_is_adsp_ready(void) { int rc = 0; - bool ret = false; + int ret = false; struct apr_hdr hdr; pr_debug("%s: enter\n", __func__); @@ -666,7 +666,7 @@ bool q6core_is_adsp_ready(void) if (rc > 0 && q6core_lcl.bus_bw_resp_received) { /* ensure to read updated param by callback thread */ rmb(); - ret = !!q6core_lcl.param; + ret = q6core_lcl.param; } } bail: |