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

Commit 080f8b8e 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: metaInfo support in acdb kernel driver"

parents d120d3ca 9be118bc

include/uapi/linux/msm_audio_calibration.h

+17 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ enum { 
	ULP_LSM_CAL_TYPE,



	DTS_EAGLE_CAL_TYPE,

	AUDIO_CORE_METAINFO_CAL_TYPE,



	MAX_CAL_TYPES,

};
@@ -169,6 +170,11 @@ struct audio_cal_post { 
	struct audio_cal_type_post	cal_type;

};



/*AUDIO_CORE_META_INFO */



struct audio_cal_info_metainfo {

	uint32_t nKey;

};



/* Cal info types */

enum {
@@ -363,6 +369,17 @@ struct audio_cal_adm_top { 
	struct audio_cal_type_adm_top	cal_type;

};



struct audio_cal_type_metainfo {

	struct audio_cal_type_header	cal_hdr;

	struct audio_cal_data		cal_data;

	struct audio_cal_info_metainfo	cal_info;

};



struct audio_core_metainfo {

	struct audio_cal_header	  hdr;

	struct audio_cal_type_metainfo cal_type;

};



struct audio_cal_type_audproc {

	struct audio_cal_type_header	cal_hdr;

	struct audio_cal_data		cal_data;

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ size_t get_cal_info_size(int32_t cal_type) 
		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_info_metainfo);

		break;

	default:

		pr_err("%s:Invalid cal type %d!",
@@ -229,6 +231,8 @@ size_t get_user_cal_type_size(int32_t cal_type) 
		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_type_metainfo);

		break;

	default:

		pr_err("%s:Invalid cal type %d!",