Commit 0eb0e272 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.6-rc2' of... 

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

ASoC: Fixes for v6.6

Quite a large collection of fixes, with numbers boosted by multiple
vendors sending multi-patch serieses.  Nothing super major, and also one
device quirk.
parents 41b07476 31bb7bd9

drivers/firmware/cirrus/cs_dsp.c

+17 −17
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static int cs_dsp_adsp2_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(adsp2_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x ZM@%x\n",

			   i, be32_to_cpu(adsp2_alg[i].alg.id),

			   (be32_to_cpu(adsp2_alg[i].alg.ver) & 0xff0000) >> 16,
@@ -1996,7 +1996,7 @@ static int cs_dsp_halo_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(halo_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x\n",

			   i, be32_to_cpu(halo_alg[i].alg.id),

			   (be32_to_cpu(halo_alg[i].alg.ver) & 0xff0000) >> 16,

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

+21 −0
Original line number Diff line number Diff line
@@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "21J6"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82QF"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -220,6 +227,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "82TL"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82UG"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -262,6 +276,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 B7ED"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/aw88395/aw88395_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -452,11 +452,13 @@ static int aw_dev_parse_reg_bin_with_hdr(struct aw_device *aw_dev, 
	if ((aw_bin->all_bin_parse_num != 1) ||

		(aw_bin->header_info[0].bin_data_type != DATA_TYPE_REGISTER)) {

		dev_err(aw_dev->dev, "bin num or type error");

		ret = -EINVAL;

		goto parse_bin_failed;

	}



	if (aw_bin->header_info[0].valid_data_len % 4) {

		dev_err(aw_dev->dev, "bin data len get error!");

		ret = -EINVAL;

		goto parse_bin_failed;

	}

sound/soc/codecs/cs35l56-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static int cs35l56_i2c_probe(struct i2c_client *client) 
		return -ENOMEM;



	cs35l56->base.dev = dev;

	cs35l56->base.can_hibernate = true;



	i2c_set_clientdata(client, cs35l56);

	cs35l56->base.regmap = devm_regmap_init_i2c(client, regmap_config);

sound/soc/codecs/cs35l56.c

+1 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ void cs35l56_remove(struct cs35l56_private *cs35l56) 
	flush_workqueue(cs35l56->dsp_wq);

	destroy_workqueue(cs35l56->dsp_wq);



	pm_runtime_dont_use_autosuspend(cs35l56->base.dev);

	pm_runtime_suspend(cs35l56->base.dev);

	pm_runtime_disable(cs35l56->base.dev);