Unverified Commit b42c0ec2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

Some of the fixes for the Intel bards overlap with development work that
removed old boards.
parents ca39fab8 839a4ec0

sound/soc/amd/acp/acp-sof-mach.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ static const struct platform_device_id board_ids[] = { 
	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);



static struct platform_driver acp_asoc_audio = {

	.driver = {

		.name = "sof_mach",

sound/soc/au1x/db1200.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static const struct platform_device_id db1200_pids[] = { 
	},

	{},

};

MODULE_DEVICE_TABLE(platform, db1200_pids);



/*-------------------------  AC97 PART  ---------------------------*/

sound/soc/codecs/cs-amp-lib-test.c

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static void cs_amp_lib_test_init_dummy_cal_blob(struct kunit *test, int num_amps 
{

	struct cs_amp_lib_test_priv *priv = test->priv;

	unsigned int blob_size;

	int i;



	blob_size = offsetof(struct cirrus_amp_efi_data, data) +

		    sizeof(struct cirrus_amp_cal_data) * num_amps;
@@ -49,6 +50,14 @@ static void cs_amp_lib_test_init_dummy_cal_blob(struct kunit *test, int num_amps 
	priv->cal_blob->count = num_amps;



	get_random_bytes(priv->cal_blob->data, sizeof(struct cirrus_amp_cal_data) * num_amps);



	/* Ensure all timestamps are non-zero to mark the entry valid. */

	for (i = 0; i < num_amps; i++)

		priv->cal_blob->data[i].calTime[0] |= 1;



	/* Ensure that all UIDs are non-zero and unique. */

	for (i = 0; i < num_amps; i++)

		*(u8 *)&priv->cal_blob->data[i].calTarget[0] = i + 1;

}



static u64 cs_amp_lib_test_get_target_uid(struct kunit *test)

sound/soc/codecs/cs-amp-lib.c

+6 −1
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ static int _cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, 
		for (i = 0; i < efi_data->count; ++i) {

			u64 cal_target = cs_amp_cal_target_u64(&efi_data->data[i]);



			/* Skip empty entries */

			if (!efi_data->data[i].calTime[0] && !efi_data->data[i].calTime[1])

				continue;



			/* Skip entries with unpopulated silicon ID */

			if (cal_target == 0)

				continue;
@@ -193,7 +197,8 @@ static int _cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, 
		}

	}



	if (!cal && (amp_index >= 0) && (amp_index < efi_data->count)) {

	if (!cal && (amp_index >= 0) && (amp_index < efi_data->count) &&

	    (efi_data->data[amp_index].calTime[0] || efi_data->data[amp_index].calTime[1])) {

		u64 cal_target = cs_amp_cal_target_u64(&efi_data->data[amp_index]);



		/*

sound/soc/intel/boards/bytcht_cx2072x.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev) 


	/* fix index of codec dai */

	for (i = 0; i < ARRAY_SIZE(byt_cht_cx2072x_dais); i++) {

		if (byt_cht_cx2072x_dais[i].codecs->name &&

		if (byt_cht_cx2072x_dais[i].num_codecs &&

		    !strcmp(byt_cht_cx2072x_dais[i].codecs->name,

			    "i2c-14F10720:00")) {

			dai_index = i;