From 833171d3f254efb64c303ffbb34d1aea7e0157d3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Jan 2024 12:25:20 +0100 Subject: [PATCH] 6.6-stable patches 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 bus-moxtet-add-spi-device-table.patch bus-moxtet-mark-the-irq-as-shared.patch --- ...r-dmi-match-for-the-tongfang-gmxxgxx.patch | 41 +++++++++++++++ ...mute-leds-for-hp-envy-x360-13-ay0xxx.patch | 34 ++++++++++++ .../bus-moxtet-add-spi-device-table.patch | 52 +++++++++++++++++++ .../bus-moxtet-mark-the-irq-as-shared.patch | 38 ++++++++++++++ queue-6.6/series | 4 ++ 5 files changed, 169 insertions(+) create mode 100644 queue-6.6/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch create mode 100644 queue-6.6/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch create mode 100644 queue-6.6/bus-moxtet-add-spi-device-table.patch create mode 100644 queue-6.6/bus-moxtet-mark-the-irq-as-shared.patch diff --git a/queue-6.6/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch b/queue-6.6/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch new file mode 100644 index 00000000000..40a478d1e1e --- /dev/null +++ b/queue-6.6/acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch @@ -0,0 +1,41 @@ +From df0cced74159c79e36ce7971f0bf250673296d93 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 23 Dec 2023 15:57:06 +0100 +Subject: ACPI: resource: Add another DMI match for the TongFang GMxXGxx + +From: Hans de Goede + +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 +Signed-off-by: Hans de Goede +Cc: All applicable +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/resource.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/acpi/resource.c ++++ b/drivers/acpi/resource.c +@@ -509,6 +509,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.6/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch b/queue-6.6/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch new file mode 100644 index 00000000000..4d537130022 --- /dev/null +++ b/queue-6.6/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch @@ -0,0 +1,34 @@ +From 6b3d14b7f9b1acaf7303d8499836bf78ee9c470c Mon Sep 17 00:00:00 2001 +From: Tom Jason Schwanke +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 + +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 +Cc: +Link: https://lore.kernel.org/r/651b26e9-e86b-45dd-aa90-3e43d6b99823@catboys.cloud +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -9735,6 +9735,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", diff --git a/queue-6.6/bus-moxtet-add-spi-device-table.patch b/queue-6.6/bus-moxtet-add-spi-device-table.patch new file mode 100644 index 00000000000..88dce09aa11 --- /dev/null +++ b/queue-6.6/bus-moxtet-add-spi-device-table.patch @@ -0,0 +1,52 @@ +From aaafe88d5500ba18b33be72458439367ef878788 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Tue, 28 Nov 2023 22:35:05 +0100 +Subject: bus: moxtet: Add spi device table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sjoerd Simons + +commit aaafe88d5500ba18b33be72458439367ef878788 upstream. + +The moxtet module fails to auto-load on. Add a SPI id table to +allow it to do so. + +Signed-off-by: Sjoerd Simons +Cc: +Reviewed-by: Marek Behún +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bus/moxtet.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c +index 48c18f95660a..e384fbc6c1d9 100644 +--- a/drivers/bus/moxtet.c ++++ b/drivers/bus/moxtet.c +@@ -830,6 +830,12 @@ static void moxtet_remove(struct spi_device *spi) + mutex_destroy(&moxtet->lock); + } + ++static const struct spi_device_id moxtet_spi_ids[] = { ++ { "moxtet" }, ++ { }, ++}; ++MODULE_DEVICE_TABLE(spi, moxtet_spi_ids); ++ + static const struct of_device_id moxtet_dt_ids[] = { + { .compatible = "cznic,moxtet" }, + {}, +@@ -841,6 +847,7 @@ static struct spi_driver moxtet_spi_driver = { + .name = "moxtet", + .of_match_table = moxtet_dt_ids, + }, ++ .id_table = moxtet_spi_ids, + .probe = moxtet_probe, + .remove = moxtet_remove, + }; +-- +2.43.0 + diff --git a/queue-6.6/bus-moxtet-mark-the-irq-as-shared.patch b/queue-6.6/bus-moxtet-mark-the-irq-as-shared.patch new file mode 100644 index 00000000000..4418ec17e30 --- /dev/null +++ b/queue-6.6/bus-moxtet-mark-the-irq-as-shared.patch @@ -0,0 +1,38 @@ +From e7830f5a83e96d8cb8efc0412902a03008f8fbe3 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Tue, 28 Nov 2023 22:35:04 +0100 +Subject: bus: moxtet: Mark the irq as shared +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sjoerd Simons + +commit e7830f5a83e96d8cb8efc0412902a03008f8fbe3 upstream. + +The Turris Mox shares the moxtet IRQ with various devices on the board, +so mark the IRQ as shared in the driver as well. + +Without this loading the module will fail with: + genirq: Flags mismatch irq 40. 00002002 (moxtet) vs. 00002080 (mcp7940x) + +Signed-off-by: Sjoerd Simons +Cc: # v6.2+ +Reviewed-by: Marek Behún +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bus/moxtet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/bus/moxtet.c ++++ b/drivers/bus/moxtet.c +@@ -755,7 +755,7 @@ static int moxtet_irq_setup(struct moxte + moxtet->irq.masked = ~0; + + ret = request_threaded_irq(moxtet->dev_irq, NULL, moxtet_irq_thread_fn, +- IRQF_ONESHOT, "moxtet", moxtet); ++ IRQF_SHARED | IRQF_ONESHOT, "moxtet", moxtet); + if (ret < 0) + goto err_free; + diff --git a/queue-6.6/series b/queue-6.6/series index c4c29c54f29..68ec592b0a7 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -129,3 +129,7 @@ x86-csum-remove-unnecessary-odd-handling.patch x86-csum-clean-up-csum_partial-further.patch drm-crtc-fix-uninitialized-variable-use.patch x86-microcode-do-not-cache-microcode-if-it-will-not-be-used.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 +bus-moxtet-mark-the-irq-as-shared.patch +bus-moxtet-add-spi-device-table.patch -- 2.47.3