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

Commit 9015ac93 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: Apply DAP effects over WFD"

parents 551493ae d8009eeb

sound/soc/msm/qdsp6v2/msm-dolby-common.h

+3 −3
Original line number Diff line number Diff line
@@ -256,9 +256,9 @@ enum { 
	REMOTE_SUBMIX			= 0x8000,

	ANC_HEADSET			= 0x10000,

	ANC_HEADPHONE			= 0x20000,

	PROXY				= 0x40000,

	FM				= 0x80000,

	FM_TX				= 0x100000,

	PROXY				= 0x2000000,

	FM				= 0x100000,

	FM_TX				= 0x1000000,

	DEVICE_OUT_DEFAULT		= 0x40000000,

	DEVICE_OUT_ALL			= 0x403FFFFF,

};

sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c

+4 −4
Original line number Diff line number Diff line
@@ -157,11 +157,11 @@ struct audio_rx_cal_data { 
static struct ds2_dap_params_s ds2_dap_params[DOLBY_MAX_CACHE];



struct ds2_device_mapping {

	int32_t device_id;

	int port_id;

	int32_t device_id; /* audio_out_... */

	int port_id; /* afe port. constant for a target variant. routing-v2*/

	/*Only one Dolby COPP  for a specific port*/

	int copp_idx;

	int cache_dev;

	int copp_idx; /* idx for the copp port on which ds2 is active */

	int cache_dev; /* idx to a shared parameter array dependent on device*/

	uint32_t stream_ref_count;

	bool active;

	void *cal_data;

sound/soc/msm/qdsp6v2/msm-ds2-dap-config.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct dolby_param_license32 { 
#define DS2_MODULE_ID			0x00010775



#define DS2_DSP_SUPPORTED_ENDP_DEVICE		17

#define DS2_DEVICES_ALL				22

#define DS2_DEVICES_ALL				32 /* enum val is 4 bytes */



enum {