Commit b3c18a55 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.11-rc3' of... 

Merge tag 'asoc-fix-v6.11-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.11

A relatively large collection of fixes here, all driver specific and
none of them particularly major, plus one MAINTAINERS update.  There's
been a bunch of work on module autoloading from several people.
parents 1fa7b099 bb448556

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -18525,7 +18525,6 @@ F: drivers/crypto/intel/qat/ 








QCOM AUDIO (ASoC) DRIVERS









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Banajit Goswami <bgoswami@quicinc.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









L:	linux-arm-msm@vger.kernel.org









S:	Supported

























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



+2
−0






























Original line number
Diff line number
Diff line







@@ -227,6 +227,8 @@ static const struct platform_device_id board_ids[] = {







	},









	{ }









};









MODULE_DEVICE_TABLE(platform, board_ids);



















static struct platform_driver acp_asoc_audio = {









	.driver = {









		.pm = &snd_soc_pm_ops,
































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)