From: Greg Kroah-Hartman Date: Sun, 8 Oct 2023 06:56:18 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v4.14.327~40 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=656a07da8938e8353d244dcbe5cd6b86e308645c;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: alsa-hda-realtek-fix-spelling-mistake-powe-power.patch alsa-hda-realtek-fixed-two-speaker-platform.patch --- diff --git a/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch b/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch new file mode 100644 index 00000000000..199d007121b --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch @@ -0,0 +1,31 @@ +From f286620b5dc974fe281d8feed6e228fd2f39d013 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Mon, 21 Aug 2023 09:00:03 +0100 +Subject: ALSA: hda/realtek: Fix spelling mistake "powe" -> "power" + +From: Colin Ian King + +commit f286620b5dc974fe281d8feed6e228fd2f39d013 upstream. + +There is a spelling mistake in a quirk entry. Fix it. + +Signed-off-by: Colin Ian King +Fixes: 3babae915f4c ("ALSA: hda/tas2781: Add tas2781 HDA driver") +Link: https://lore.kernel.org/r/20230821080003.16678-1-colin.i.king@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9993,7 +9993,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN), + SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C), + SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C), +- SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual powe mode2 YC", ALC287_FIXUP_TAS2781_I2C), ++ SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual power mode2 YC", ALC287_FIXUP_TAS2781_I2C), + SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C), + SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C), + SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C), diff --git a/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch b/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch new file mode 100644 index 00000000000..20a386443ea --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch @@ -0,0 +1,36 @@ +From fb6254df09bba303db2a1002085f6c0b90a456ed Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Tue, 12 Sep 2023 15:31:49 +0800 +Subject: ALSA: hda/realtek - Fixed two speaker platform + +From: Kailang Yang + +commit fb6254df09bba303db2a1002085f6c0b90a456ed upstream. + +If system has two speakers and one connect to 0x14 pin, use this +function will disable it. + +Fixes: e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support") +Signed-off-by: Kailang Yang +Link: https://lore.kernel.org/r/e3f2aac3fe6a47079d728a6443358cc2@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7062,8 +7062,10 @@ static void alc287_fixup_bind_dacs(struc + snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn); + spec->gen.preferred_dacs = preferred_pairs; + spec->gen.auto_mute_via_amp = 1; +- snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, +- 0x0); /* Make sure 0x14 was disable */ ++ if (spec->gen.autocfg.speaker_pins[0] != 0x14) { ++ snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, ++ 0x0); /* Make sure 0x14 was disable */ ++ } + } + + diff --git a/queue-6.1/series b/queue-6.1/series index f05b9648ccc..ef54ece5c13 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -149,3 +149,5 @@ rdma-srp-do-not-call-scsi_done-from-srp_abort.patch rdma-siw-fix-connection-failure-handling.patch rdma-mlx5-fix-mutex-unlocking-on-error-flow-for-steering-anchor-creation.patch rdma-mlx5-fix-null-string-error.patch +alsa-hda-realtek-fix-spelling-mistake-powe-power.patch +alsa-hda-realtek-fixed-two-speaker-platform.patch