Commit 17c6a0c9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.8-rc5' of... 

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

ASoC: Fixes for v6.8

A few small fixes, some driver specific and one slightly larger one
from Richard which adds a new core helper and updates a small clutch of
drivers to deal with the fact that they were using a helper which
requires that the lock for the list of controls without holding that
lock.  We also have some quirks for new AMD based Lenovo systems.
parents b34bf658 ed00a694

include/sound/soc-card.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ static inline void snd_soc_card_mutex_unlock(struct snd_soc_card *card) 


struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

struct snd_kcontrol *snd_soc_card_get_kcontrol_locked(struct snd_soc_card *soc_card,

						      const char *name);

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

			  struct snd_soc_jack *jack);

int snd_soc_card_jack_new_pins(struct snd_soc_card *card, const char *id,

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

+14 −0
Original line number Diff line number Diff line
@@ -199,6 +199,20 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "21HY"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21J2"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21J0"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

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

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static int snd_acp6x_probe(struct pci_dev *pci, 
	/* Yellow Carp device check */

	switch (pci->revision) {

	case 0x60:

	case 0x63:

	case 0x6f:

		break;

	default:

sound/soc/codecs/cs35l45.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int cs35l45_activate_ctl(struct snd_soc_component *component, 
	else

		snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s", ctl_name);



	kcontrol = snd_soc_card_get_kcontrol(component->card, name);

	kcontrol = snd_soc_card_get_kcontrol_locked(component->card, name);

	if (!kcontrol) {

		dev_err(component->dev, "Can't find kcontrol %s\n", name);

		return -EINVAL;

sound/soc/codecs/cs35l56-shared.c

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ void cs35l56_wait_min_reset_pulse(void) 
EXPORT_SYMBOL_NS_GPL(cs35l56_wait_min_reset_pulse, SND_SOC_CS35L56_SHARED);



static const struct reg_sequence cs35l56_system_reset_seq[] = {

	REG_SEQ0(CS35L56_DSP1_HALO_STATE, 0),

	REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET),

};