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

Commit 32a565cb 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: Update clients to use new audio cal driver"

parents 285a8344 cb9b89a9

include/sound/apr_audio-v2.h

+3 −6
Original line number Diff line number Diff line
@@ -2399,9 +2399,10 @@ struct afe_port_cmdrsp_get_param_v2 { 
*/

#define ADSP_MEMORY_MAP_PHYSICAL_MEMORY 0



#define NULL_POPP_TOPOLOGY				0x00010C68

#define NULL_COPP_TOPOLOGY				0x00010312

#define DEFAULT_COPP_TOPOLOGY				0x00010be3

#define DEFAULT_POPP_TOPOLOGY				0x00010be4

#define DEFAULT_COPP_TOPOLOGY				0x00010BE3

#define DEFAULT_POPP_TOPOLOGY				0x00010BE4

#define VPM_TX_SM_ECNS_COPP_TOPOLOGY			0x00010F71

#define VPM_TX_DM_FLUENCE_COPP_TOPOLOGY			0x00010F72

#define VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY		0x00010F75
@@ -2639,10 +2640,6 @@ struct asm_softvolume_params { 


#define ASM_MEDIA_FMT_MULTI_CHANNEL_PCM_V2 0x00010DA5



#define ASM_STREAM_POSTPROC_TOPO_ID_DEFAULT 0x00010BE4



#define ASM_STREAM_POSTPROC_TOPO_ID_NONE 0x00010C68



#define ASM_MEDIA_FMT_EVRCB_FS 0x00010BEF



#define ASM_MEDIA_FMT_EVRCWB_FS 0x00010BF0

include/sound/q6adm-v2.h

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ int adm_open(int port, int path, int rate, int mode, int topology, 
			   int perf_mode, uint16_t bits_per_sample,

			   int app_type);



int adm_unmap_cal_blocks(void);



int adm_map_rtac_block(struct rtac_cal_block_data *cal_block);



int adm_unmap_rtac_block(uint32_t *mem_map_handle);
@@ -72,7 +70,9 @@ int adm_get_default_copp_idx(int port_id); 


int adm_get_topology_for_port_from_copp_id(int port_id, int copp_id);



int adm_validate_copp_id(int copp_id);

int adm_get_topology_for_port_copp_idx(int port_id, int copp_idx);



int adm_get_indexes_from_copp_id(int copp_id, int *port_idx, int *copp_idx);



int adm_set_stereo_to_custom_stereo(int port_id, int copp_idx,

				    unsigned int session_id,

include/sound/q6afe-v2.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ int afe_get_port_index(u16 port_id); 
int afe_start_pseudo_port(u16 port_id);

int afe_stop_pseudo_port(u16 port_id);

uint32_t afe_req_mmap_handle(struct afe_audio_client *ac);

int afe_unmap_cal_blocks(void);

int afe_memory_map(phys_addr_t dma_addr_p, u32 dma_buf_sz,

		struct afe_audio_client *ac);

int afe_cmd_memory_map(phys_addr_t dma_addr_p, u32 dma_buf_sz);

include/sound/q6asm-v2.h

+3 −2
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ int q6asm_memory_map(struct audio_client *ac, phys_addr_t buf_add, 
int q6asm_memory_unmap(struct audio_client *ac, phys_addr_t buf_add,

							int dir);



int q6asm_unmap_cal_blocks(void);



int q6asm_map_rtac_block(struct rtac_cal_block_data *cal_block);



int q6asm_unmap_rtac_block(uint32_t *mem_map_handle);
@@ -406,4 +404,7 @@ int q6asm_send_meta_data(struct audio_client *ac, uint32_t initial_samples, 
int q6asm_stream_send_meta_data(struct audio_client *ac, uint32_t stream_id,

		uint32_t initial_samples, uint32_t trailing_samples);



/* Get current ASM topology */

int q6asm_get_asm_topology(void);



#endif /* __Q6_ASM_H__ */

include/uapi/linux/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ header-y += msm_vidc_enc.h 
header-y += msm_audio.h

header-y += msm_audio_aac.h

header-y += msm_audio_ac3.h

header-y += msm_audio_acdb.h

header-y += msm_audio_calibration.h

header-y += msm_audio_wma.h

header-y += msm_audio_wmapro.h