From: Takashi Iwai Date: Tue, 10 Sep 2024 08:27:43 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Tag: v6.12-rc1~169^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5516e3f4763e3604b789b3567dafe4388eec4a8f;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'for-linus' into for-next Signed-off-by: Takashi Iwai --- 5516e3f4763e3604b789b3567dafe4388eec4a8f diff --cc sound/pci/hda/patch_realtek.c index f67190a8cd93d,452c6e7c20e20..2e90c713b4a2c --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@@ -10433,8 -10494,12 +10435,9 @@@ static const struct snd_pci_quirk alc26 SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2), SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS), - SND_PCI_QUIRK(0x1043, 0x1e63, "ASUS H7606W", ALC285_FIXUP_CS35L56_I2C_2), - SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_CS35L56_I2C_2), SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),