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

Commit f5f5fe1e 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: Integrate Eagle framework to support HeadphoneX"

parents 6baca549 611fc3bb

include/sound/apr_audio-v2.h

+17 −0
Original line number Diff line number Diff line
@@ -2405,6 +2405,8 @@ struct afe_port_cmdrsp_get_param_v2 { 
#define VPM_TX_DM_FLUENCE_COPP_TOPOLOGY			0x00010F72

#define VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY		0x00010F75

#define VPM_TX_DM_RFECNS_COPP_TOPOLOGY			0x00010F86

#define ADM_CMD_COPP_OPEN_TOPOLOGY_ID_DTS_HPX_0		0x00010347

#define ADM_CMD_COPP_OPEN_TOPOLOGY_ID_DTS_HPX_1		0x00010348



/* Memory map regions command payload used by the

 * #ASM_CMD_SHARED_MEM_MAP_REGIONS ,#ADM_CMD_SHARED_MEM_MAP_REGIONS
@@ -6916,6 +6918,21 @@ struct srs_trumedia_params { 
} __packed;

/* SRS TruMedia end */



/* DTS Eagle */

#define AUDPROC_MODULE_ID_DTS_HPX_PREMIX 0x0001077C

#define AUDPROC_MODULE_ID_DTS_HPX_POSTMIX 0x0001077B

#define ASM_STREAM_POSTPROC_TOPO_ID_DTS_HPX 0x00010DED

struct asm_dts_eagle_param {

	struct apr_hdr	hdr;

	struct asm_stream_cmd_set_pp_params_v2 param;

	struct asm_stream_param_data_v2 data;

} __packed;



struct asm_dts_eagle_param_get {

	struct apr_hdr	hdr;

	struct asm_stream_cmd_get_pp_params_v2 param;

} __packed;



/* LSM Specific */

#define VW_FEAT_DIM					(39)

include/sound/q6adm-v2.h

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ struct route_payload { 
int srs_trumedia_open(int port_id, int copp_idx, int srs_tech_id,

		      void *srs_params);



int adm_dts_eagle_set(int port_id, int copp_idx, int param_id,

		      void *data, int size);



int adm_dts_eagle_get(int port_id, int copp_idx, int param_id,

		      void *data, int size);



int adm_get_params(int port_id, int copp_idx, uint32_t module_id,

		   uint32_t param_id, uint32_t params_length, char *params);

include/sound/q6asm-v2.h

+5 −0
Original line number Diff line number Diff line
@@ -378,6 +378,11 @@ int q6asm_equalizer(struct audio_client *ac, void *eq); 
/* Send Volume Command */

int q6asm_set_volume(struct audio_client *ac, int volume);



int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, int size,

			void *data);

int q6asm_dts_eagle_get(struct audio_client *ac, int param_id,

			int size, void *data);



/* Set SoftPause Params */

int q6asm_set_softpause(struct audio_client *ac,

			struct asm_softpause_params *param);

include/sound/q6core.h

+12 −0
Original line number Diff line number Diff line
@@ -94,6 +94,18 @@ int core_get_low_power_segments( 
			struct avcs_cmd_rsp_get_low_power_segments_info_t **);

bool q6core_is_adsp_ready(void);



#define ADSP_CMD_SET_DTS_EAGLE_DATA_ID 0x00012919

#define DTS_EAGLE_LICENSE_ID           0x00028346

struct adsp_dts_eagle {

	struct apr_hdr hdr;

	uint32_t id;

	uint32_t overwrite;

	uint32_t size;

	char data[];

};

int core_dts_eagle_set(int size, char *data);

int core_dts_eagle_get(int id, int size, char *data);



#define ADSP_CMD_SET_DOLBY_MANUFACTURER_ID 0x00012918



struct adsp_dolby_manufacturer_id {

include/uapi/sound/audio_effects.h

+18 −0
Original line number Diff line number Diff line
@@ -133,7 +133,25 @@ 
#define EQ_BAND_BOOST	5

#define EQ_BAND_CUT	6



#define DTS_EAGLE_MODULE		0x00005000

#define EAGLE_DRIVER_ID 0xF2

#define DTS_EAGLE_IOCTL_GET_CACHE_SIZE _IOR(EAGLE_DRIVER_ID, 0, int)

#define DTS_EAGLE_IOCTL_SET_CACHE_SIZE _IOW(EAGLE_DRIVER_ID, 1, int)

#define DTS_EAGLE_IOCTL_GET_PARAM _IOR(EAGLE_DRIVER_ID, 2, void*)

#define DTS_EAGLE_IOCTL_SET_PARAM _IOW(EAGLE_DRIVER_ID, 3, void*)

#define DTS_EAGLE_IOCTL_SET_CACHE_BLOCK _IOW(EAGLE_DRIVER_ID, 4, void*)

#define DTS_EAGLE_IOCTL_SET_ACTIVE_DEVICE _IOW(EAGLE_DRIVER_ID, 5, void*)

#define DTS_EAGLE_IOCTL_GET_LICENSE _IOR(EAGLE_DRIVER_ID, 6, void*)

#define DTS_EAGLE_IOCTL_SET_LICENSE _IOW(EAGLE_DRIVER_ID, 7, void*)

#define DTS_EAGLE_IOCTL_SEND_LICENSE _IOW(EAGLE_DRIVER_ID, 8, int)

#define DTS_EAGLE_IOCTL_SET_VOLUME_COMMANDS _IOW(EAGLE_DRIVER_ID, 9, void*)



struct dts_eagle_param_desc {

	__u32 id;

	__s32 size;

	__s32 offset;

	__u32 device;

} __packed;



#define COMMAND_PAYLOAD_LEN	3

#define COMMAND_PAYLOAD_SZ	(COMMAND_PAYLOAD_LEN * sizeof(uint32_t))