Commit 5ec23a1b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.12-rc7' of... 

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

ASoC: Fixes for v6.12

Some last updates for v6.12, one quirk plus a couple of fixes.  One is a
minor fix for a relatively obscure driver and the other is a relatively
important fix for boot hangs with some audio graph based cards.
parents 2143c8ae 2ae6da56

sound/soc/codecs/max9768.c

+9 −2
Original line number Diff line number Diff line
@@ -54,10 +54,17 @@ static int max9768_set_gpio(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);

	struct max9768 *max9768 = snd_soc_component_get_drvdata(c);

	bool val = !ucontrol->value.integer.value[0];

	int ret;



	gpiod_set_value_cansleep(max9768->mute, !ucontrol->value.integer.value[0]);

	if (val != gpiod_get_value_cansleep(max9768->mute))

		ret = 1;

	else

		ret = 0;



	return 0;

	gpiod_set_value_cansleep(max9768->mute, val);



	return ret;

}



static const DECLARE_TLV_DB_RANGE(volume_tlv,

sound/soc/generic/audio-graph-card2.c

+3 −0
Original line number Diff line number Diff line
@@ -270,16 +270,19 @@ static enum graph_type __graph_get_type(struct device_node *lnk) 


	if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) {

		ret = GRAPH_MULTI;

		fw_devlink_purge_absent_suppliers(&np->fwnode);

		goto out_put;

	}



	if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) {

		ret = GRAPH_DPCM;

		fw_devlink_purge_absent_suppliers(&np->fwnode);

		goto out_put;

	}



	if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) {

		ret = GRAPH_C2C;

		fw_devlink_purge_absent_suppliers(&np->fwnode);

		goto out_put;

	}

sound/soc/intel/boards/sof_sdw.c

+8 −0
Original line number Diff line number Diff line
@@ -590,6 +590,14 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		},

		.driver_data = (void *)(SOC_SDW_CODEC_SPKR),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CF1")

		},

		.driver_data = (void *)(SOC_SDW_CODEC_SPKR),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {