]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2024 11:25:11 +0000 (12:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2024 11:25:11 +0000 (12:25 +0100)
added patches:
acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch
alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch

queue-6.1/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch [new file with mode: 0644]
queue-6.1/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch b/queue-6.1/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch
new file mode 100644 (file)
index 0000000..831fac0
--- /dev/null
@@ -0,0 +1,41 @@
+From df0cced74159c79e36ce7971f0bf250673296d93 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 23 Dec 2023 15:57:06 +0100
+Subject: ACPI: resource: Add another DMI match for the TongFang GMxXGxx
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit df0cced74159c79e36ce7971f0bf250673296d93 upstream.
+
+The TongFang GMxXGxx, which needs IRQ overriding for the keyboard to work,
+is also sold as the Eluktronics RP-15 which does not use the standard
+TongFang GMxXGxx DMI board_name.
+
+Add an entry for this laptop to the irq1_edge_low_force_override[] DMI
+table to make the internal keyboard functional.
+
+Reported-by: Luis Acuna <ldacuna@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Cc: All applicable <stable@vger.kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/acpi/resource.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/acpi/resource.c
++++ b/drivers/acpi/resource.c
+@@ -513,6 +513,13 @@ static const struct dmi_system_id mainge
+               },
+       },
+       {
++              /* TongFang GMxXGxx sold as Eluktronics Inc. RP-15 */
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "Eluktronics Inc."),
++                      DMI_MATCH(DMI_BOARD_NAME, "RP-15"),
++              },
++      },
++      {
+               /* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),
diff --git a/queue-6.1/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch b/queue-6.1/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch
new file mode 100644 (file)
index 0000000..965b7e2
--- /dev/null
@@ -0,0 +1,34 @@
+From 6b3d14b7f9b1acaf7303d8499836bf78ee9c470c Mon Sep 17 00:00:00 2001
+From: Tom Jason Schwanke <tom@catboys.cloud>
+Date: Mon, 8 Jan 2024 16:15:21 +0100
+Subject: ALSA: hda/realtek: Fix mute and mic-mute LEDs for HP Envy X360 13-ay0xxx
+
+From: Tom Jason Schwanke <tom@catboys.cloud>
+
+commit 6b3d14b7f9b1acaf7303d8499836bf78ee9c470c upstream.
+
+This enables the mute and mic-mute LEDs on the HP Envy X360 13-ay0xxx
+convertibles.
+The quirk 'ALC245_FIXUP_HP_X360_MUTE_LEDS' already exists and is now
+enabled for this device.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=216197
+Signed-off-by: Tom Jason Schwanke <tom@catboys.cloud>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/651b26e9-e86b-45dd-aa90-3e43d6b99823@catboys.cloud
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_realtek.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -9607,6 +9607,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x103c, 0x8735, "HP ProBook 435 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+       SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+       SND_PCI_QUIRK(0x103c, 0x8760, "HP", ALC285_FIXUP_HP_MUTE_LED),
++      SND_PCI_QUIRK(0x103c, 0x876e, "HP ENVY x360 Convertible 13-ay0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),
+       SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
+       SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
+       SND_PCI_QUIRK(0x103c, 0x8780, "HP ZBook Fury 17 G7 Mobile Workstation",
index e160cb8f3816773a268883c551e448590187f82c..2ab6bf04d2918f3fdeac82f362bffc3d633444b2 100644 (file)
@@ -81,3 +81,5 @@ virtio_blk-fix-snprintf-truncation-compiler-warning.patch
 net-qrtr-ns-return-0-if-server-port-is-not-present.patch
 arm-sun9i-smp-fix-return-code-check-of-of_property_m.patch
 drm-crtc-fix-uninitialized-variable-use.patch
+alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch
+acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch