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

Commit 1a814a97 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: Add few more Dolby endpoint dependent paramters"

parents 9ec70cfa 631a4233

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

+184 −69
Original line number Diff line number Diff line
@@ -44,74 +44,189 @@ struct dolby_dap_endp_params_s { 
const struct dolby_dap_endp_params_s

			dolby_dap_endp_params[NUM_DOLBY_ENDP_DEVICE] = {

	{EARPIECE, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{SPEAKER, 2, DOLBY_ENDP_INT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{WIRED_HEADSET,	2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{WIRED_HEADPHONE, 2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_SCO,	2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_SCO_HEADSET,	2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_SCO_CARKIT, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_A2DP, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_A2DP_HEADPHONES, 2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{BLUETOOTH_A2DP_SPEAKER, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{AUX_DIGITAL, 2, DOLBY_ENDP_HDMI,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-640} },

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

		{-496, -496, 0}

	},

	{AUX_DIGITAL, 6, DOLBY_ENDP_HDMI,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-640} },

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

		{-496, -496, 0}

	},

	{AUX_DIGITAL, 8, DOLBY_ENDP_HDMI,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-640} },

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

		{-496, -496, 0}

	},

	{ANLG_DOCK_HEADSET, 2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{DGTL_DOCK_HEADSET, 2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{USB_ACCESSORY,	2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{USB_DEVICE, 2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

	{REMOTE_SUBMIX,	2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

		{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_HEADSET, 2, DOLBY_ENDP_HEADPHONES,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

		{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_TX,	2, DOLBY_ENDP_EXT_SPEAKERS,

		{DOLBY_PARAM_ID_DVLO}, {DOLBY_ENDDEP_PARAM_DVLO_LENGTH},

		{DOLBY_ENDDEP_PARAM_DVLO_OFFSET}, {-320} },

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

	},

};



/* dolby param ids to/from dsp */

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

+11 −4
Original line number Diff line number Diff line
@@ -226,10 +226,17 @@ 
#define DOLBY_PARAM_PAYLOAD_SIZE		3

#define DOLBY_MAX_LENGTH_INDIVIDUAL_PARAM	329



#define DOLBY_NUM_ENDP_DEPENDENT_PARAMS		1

#define DOLBY_NUM_ENDP_DEPENDENT_PARAMS	  3

#define DOLBY_ENDDEP_PARAM_DVLO_OFFSET	  0

#define DOLBY_ENDDEP_PARAM_DVLO_LENGTH	  1

#define DOLBY_ENDDEP_PARAM_LENGTH		DOLBY_ENDDEP_PARAM_DVLO_LENGTH

#define DOLBY_ENDDEP_PARAM_DVLI_OFFSET    (DOLBY_ENDDEP_PARAM_DVLO_OFFSET + \

						DOLBY_ENDDEP_PARAM_DVLO_LENGTH)

#define DOLBY_ENDDEP_PARAM_DVLI_LENGTH    1

#define DOLBY_ENDDEP_PARAM_VMB_OFFSET     (DOLBY_ENDDEP_PARAM_DVLI_OFFSET + \

						DOLBY_ENDDEP_PARAM_DVLI_LENGTH)

#define DOLBY_ENDDEP_PARAM_VMB_LENGTH     1

#define DOLBY_ENDDEP_PARAM_LENGTH         (DOLBY_ENDDEP_PARAM_DVLO_LENGTH + \

		DOLBY_ENDDEP_PARAM_DVLI_LENGTH + DOLBY_ENDDEP_PARAM_VMB_LENGTH)



#define MAX_DOLBY_PARAMS			47

#define MAX_DOLBY_CTRL_PARAMS			5