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

Commit 790d6460 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: Fix DTS Eagle cal type initialization"

parents 98b7a082 4c0da6ab

include/uapi/linux/msm_audio_calibration.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ enum { 
	ULP_AFE_CAL_TYPE,

	ULP_LSM_CAL_TYPE,



	DTS_EAGLE_CAL_TYPE,



	MAX_CAL_TYPES,

};

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ size_t get_cal_info_size(int32_t cal_type) 
	case ULP_LSM_CAL_TYPE:

		size = sizeof(struct audio_cal_info_lsm);

		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

		break;

	default:

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

			__func__, cal_type);
@@ -228,6 +231,9 @@ size_t get_user_cal_type_size(int32_t cal_type) 
	case ULP_LSM_CAL_TYPE:

		size = sizeof(struct audio_cal_type_lsm);

		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

		break;

	default:

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

			__func__, cal_type);

sound/soc/msm/qdsp6v2/q6adm.c

+4 −0
Original line number Diff line number Diff line
@@ -2274,6 +2274,10 @@ static int adm_init_cal_data(void) 


		{{ADM_RTAC_APR_CAL_TYPE,

		{NULL, NULL, NULL, NULL, NULL, NULL} },

		{NULL, NULL, cal_utils_match_only_block} },



		{{DTS_EAGLE_CAL_TYPE,

		{NULL, NULL, NULL, NULL, NULL, NULL} },

		{NULL, NULL, cal_utils_match_only_block} }

	};

	pr_debug("%s:\n", __func__);