Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1c2b1f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: return the proper LPASS status"

parents d803000f 125ff102

include/sound/q6core.h

+3 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/msm/qdsp6v2/q6core.c

+3 −3
Original line number Diff line number Diff line
@@ -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: