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

Commit 99d9362c 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: remove ANC devices for Dolby configuration"

parents 4877a522 69b052b2

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

+0 −16
Original line number Diff line number Diff line
@@ -175,22 +175,6 @@ const struct dolby_dap_endp_params_s 
		 DOLBY_ENDDEP_PARAM_VMB_OFFSET},

		{-320, -320, 144}

	},

	{ANC_HEADSET, 2, DOLBY_ENDP_HEADPHONES,

		{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}

	},

	{ANC_HEADPHONE,	2, DOLBY_ENDP_HEADPHONES,

		{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}

	},

	{PROXY,	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,

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

+4 −6
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			24

#define NUM_DOLBY_ENDP_DEVICE			22

#define DOLBY_VIS_PARAM_HEADER_SIZE		 25



#define DOLBY_INVALID_PORT_ID			-1
@@ -287,11 +287,9 @@ enum { 
	USB_ACCESSORY			= 0x2000,

	USB_DEVICE			= 0x4000,

	REMOTE_SUBMIX			= 0x8000,

	ANC_HEADSET			= 0x10000,

	ANC_HEADPHONE			= 0x20000,

	PROXY				= 0x40000,

	FM				= 0x80000,

	FM_TX				= 0x100000,

	PROXY				= 0x10000,

	FM				= 0x20000,

	FM_TX				= 0x40000,

	DEVICE_OUT_ALL			= 0x7FFFFFFF,

};

/* DOLBY device definitions end */