Commit 00f32dfc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

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

ASoC: Fixes for v6.19

A couple of small fixes and a couple of quirks, nothing major
parents 9e18920e 94e5baff

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

+8 −0
Original line number Diff line number Diff line
@@ -682,6 +682,14 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "GOH-X"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "RB"),

			DMI_MATCH(DMI_BOARD_NAME, "XyloD5_RBU"),

		}

	},



	{}

};

sound/soc/intel/boards/sof_es8336.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void pcm_pop_work_events(struct work_struct *work) 
	gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en);



	if (quirk & SOF_ES8336_HEADPHONE_GPIO)

		gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en);

		gpiod_set_value_cansleep(priv->gpio_headphone, !priv->speaker_en);



}

sound/soc/intel/boards/sof_sdw.c

+1 −0
Original line number Diff line number Diff line
@@ -838,6 +838,7 @@ static const struct snd_pci_quirk sof_sdw_ssid_quirk_table[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2347, "Lenovo P16", SOC_SDW_CODEC_MIC),

	SND_PCI_QUIRK(0x17aa, 0x2348, "Lenovo P16", SOC_SDW_CODEC_MIC),

	SND_PCI_QUIRK(0x17aa, 0x2349, "Lenovo P1", SOC_SDW_CODEC_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3821, "Lenovo 0x3821", SOC_SDW_SIDECAR_AMPS),

	{}

};

sound/soc/intel/common/soc-acpi-intel-ptl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = { 
		.adr = 0x000230025D132001ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1320-1"

		.name_prefix = "rt1320-2"

	}

};