Commit 10db9528 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.16-merge-window' of... 

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

ASoC: Fixes for v6.16

A bunch of fixes, including a big batch for the Intel AVS driver, and
one new device ID.  It's all device specific.
parents 6a3439a4 b7188a1c

drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c

+2 −1
Original line number Diff line number Diff line
@@ -133,10 +133,11 @@ void cs_dsp_mock_wmfw_add_info(struct cs_dsp_mock_wmfw_builder *builder, 


	if (info_len % 4) {

		/* Create a padded string with length a multiple of 4 */

		size_t copy_len = info_len;

		info_len = round_up(info_len, 4);

		tmp = kunit_kzalloc(builder->test_priv->test, info_len, GFP_KERNEL);

		KUNIT_ASSERT_NOT_ERR_OR_NULL(builder->test_priv->test, tmp);

		memcpy(tmp, info, info_len);

		memcpy(tmp, info, copy_len);

		info = tmp;

	}

drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c

+0 −1
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ static void cs_dsp_ctl_cache_init_multiple_offsets(struct kunit *test) 
					      "dummyalg", NULL);



	/* Create controls identical except for offset */

	def.length_bytes = 8;

	def.offset_dsp_words = 0;

	def.shortname = "CtlA";

	cs_dsp_mock_wmfw_add_coeff_desc(local->wmfw_builder, &def);

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -311,6 +311,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "83AS"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83BS"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/es8375.c

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ static int es8375_hw_params(struct snd_pcm_substream *substream, 
	coeff = get_coeff(es8375->vddd, dmic_enable, es8375->mclk_freq, params_rate(params));

	if (coeff < 0) {

		dev_warn(component->dev, "Clock coefficients do not match");

		return coeff;

	}

	regmap_write(es8375->regmap, ES8375_CLK_MGR4,

			coeff_div[coeff].Reg0x04);

sound/soc/codecs/hda.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ int hda_codec_probe_complete(struct hda_codec *codec) 
	ret = snd_hda_codec_build_controls(codec);

	if (ret < 0) {

		dev_err(&hdev->dev, "unable to create controls %d\n", ret);

		goto out;

		return ret;

	}



	/* Bus suspended codecs as it does not manage their pm */
@@ -160,7 +160,7 @@ int hda_codec_probe_complete(struct hda_codec *codec) 
	/* rpm was forbidden in snd_hda_codec_device_new() */

	snd_hda_codec_set_power_save(codec, 2000);

	snd_hda_codec_register(codec);

out:



	/* Complement pm_runtime_get_sync(bus) in probe */

	pm_runtime_mark_last_busy(bus->dev);

	pm_runtime_put_autosuspend(bus->dev);