Skip to content

Commit 4545981

Browse files
committed
Merge tag 'sound-6.10-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull more sound fixes from Takashi Iwai: "A follow-up fix for a random build issue, as well as another trivial HD-audio quirk" * tag 'sound-6.10-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda: Use imply for suggesting CONFIG_SERIAL_MULTI_INSTANTIATE ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14AHP9
2 parents 36c0758 + 17563b4 commit 4545981

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sound/pci/hda/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ config SND_HDA_SCODEC_CS35L56_I2C
162162
depends on ACPI || COMPILE_TEST
163163
depends on SND_SOC
164164
select FW_CS_DSP
165-
select SERIAL_MULTI_INSTANTIATE
165+
imply SERIAL_MULTI_INSTANTIATE
166166
select SND_HDA_GENERIC
167167
select SND_SOC_CS35L56_SHARED
168168
select SND_HDA_SCODEC_CS35L56
@@ -179,7 +179,7 @@ config SND_HDA_SCODEC_CS35L56_SPI
179179
depends on ACPI || COMPILE_TEST
180180
depends on SND_SOC
181181
select FW_CS_DSP
182-
select SERIAL_MULTI_INSTANTIATE
182+
imply SERIAL_MULTI_INSTANTIATE
183183
select SND_HDA_GENERIC
184184
select SND_SOC_CS35L56_SHARED
185185
select SND_HDA_SCODEC_CS35L56

sound/pci/hda/patch_realtek.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10555,6 +10555,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1055510555
SND_PCI_QUIRK(0x17aa, 0x3882, "Lenovo Yoga Pro 7 14APH8", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
1055610556
SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
1055710557
SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
10558+
SND_PCI_QUIRK(0x17aa, 0x3891, "Lenovo Yoga Pro 7 14AHP9", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
1055810559
SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),
1055910560
SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C),
1056010561
SND_PCI_QUIRK(0x17aa, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

0 commit comments

Comments
 (0)