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

Commit ce485824 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: Update the correct channel count for dolby configuration"

parents f6239bef fb149b15

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

+10 −1
Original line number Diff line number Diff line
@@ -199,6 +199,14 @@ const struct dolby_dap_endp_params_s 
		 DOLBY_ENDDEP_PARAM_VMB_OFFSET},

		{-320, -320, 144}

	},

	{PROXY,	6, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO, DOLBY_PARAM_ID_DVLI, DOLBY_PARAM_ID_VMB},

		{DOLBY_ENDDEP_PARAM_DVLO_LENGTH, DOLBY_ENDDEP_PARAM_DVLI_LENGTH,

		 DOLBY_ENDDEP_PARAM_VMB_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET, DOLBY_ENDDEP_PARAM_DVLI_OFFSET,

		 DOLBY_ENDDEP_PARAM_VMB_OFFSET},

		{-320, -320, 144}

	},

	{FM, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO, DOLBY_PARAM_ID_DVLI, DOLBY_PARAM_ID_VMB},

		{DOLBY_ENDDEP_PARAM_DVLO_LENGTH, DOLBY_ENDDEP_PARAM_DVLI_LENGTH,
@@ -398,7 +406,8 @@ static int msm_dolby_dap_send_enddep_params(int port_id, int device_channels) 
	for (idx = 0; idx < NUM_DOLBY_ENDP_DEVICE; idx++) {

		if (dolby_dap_endp_params[idx].device ==

			dolby_dap_params_states.device) {

			if (dolby_dap_params_states.device == AUX_DIGITAL) {

			if (dolby_dap_params_states.device == AUX_DIGITAL ||

			    dolby_dap_params_states.device == PROXY) {

				if (dolby_dap_endp_params[idx].device_ch_caps ==

					device_channels)

					break;

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ 
#define DOLBY_AUTO_ENDDEP_IDX			(MAX_DOLBY_PARAMS+4)



#define TOTAL_LENGTH_DOLBY_PARAM		745

#define NUM_DOLBY_ENDP_DEVICE			23

#define NUM_DOLBY_ENDP_DEVICE			24

#define DOLBY_VIS_PARAM_HEADER_SIZE		 25



#define DOLBY_INVALID_PORT_ID			-1