From: Sasha Levin Date: Mon, 9 Oct 2023 17:37:39 +0000 (-0400) Subject: Drop alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch X-Git-Tag: v4.14.327~18^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c300c5003134f3265b20f2864820b193ccbf37b4;p=thirdparty%2Fkernel%2Fstable-queue.git Drop alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch b/queue-6.1/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch deleted file mode 100644 index 1af651cffb4..00000000000 --- a/queue-6.1/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7028ce65c3db5104a485063bfaf593e5c3d0e817 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 24 Aug 2023 20:39:48 +0200 -Subject: ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx - -From: Fabian Vogt - -[ Upstream commit c99c26b16c1544534ebd6a5f27a034f3e44d2597 ] - -The LED for the mic mute button is controlled by GPIO2. -The mute button LED is slightly more complex, it's controlled by two bits -in coeff 0x0b. - -Signed-off-by: Fabian Vogt -Link: https://lore.kernel.org/r/2693091.mvXUDI8C0e@fabians-envy -Signed-off-by: Takashi Iwai -Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support") -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_realtek.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index e81bc0c026eba..e01af481e0d0d 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -7306,6 +7306,7 @@ enum { - ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, - ALC287_FIXUP_TAS2781_I2C, - ALC245_FIXUP_HP_MUTE_LED_COEFBIT, -+ ALC245_FIXUP_HP_X360_MUTE_LEDS, - }; - - /* A special fixup for Lenovo C940 and Yoga Duet 7; -@@ -9385,6 +9386,12 @@ static const struct hda_fixup alc269_fixups[] = { - .type = HDA_FIXUP_FUNC, - .v.func = alc245_fixup_hp_mute_led_coefbit, - }, -+ [ALC245_FIXUP_HP_X360_MUTE_LEDS] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc245_fixup_hp_mute_led_coefbit, -+ .chained = true, -+ .chain_id = ALC245_FIXUP_HP_GPIO_LED -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -9620,6 +9627,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), - SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), - SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2), -+ SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS), - SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED), - SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), --- -2.40.1 - diff --git a/queue-6.1/series b/queue-6.1/series index 09bfd142a9a..a31ccaa13e4 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -2,7 +2,6 @@ spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch alsa-hda-tas2781-add-tas2781-hda-driver.patch alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch -alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch mptcp-rename-timer-related-helper-to-less-confusing-.patch diff --git a/queue-6.5/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch b/queue-6.5/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch deleted file mode 100644 index ab31cccd61c..00000000000 --- a/queue-6.5/alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch +++ /dev/null @@ -1,58 +0,0 @@ -From eadc5fca3515ed944bad90e2403d0742ad11cf93 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 24 Aug 2023 20:39:48 +0200 -Subject: ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx - -From: Fabian Vogt - -[ Upstream commit c99c26b16c1544534ebd6a5f27a034f3e44d2597 ] - -The LED for the mic mute button is controlled by GPIO2. -The mute button LED is slightly more complex, it's controlled by two bits -in coeff 0x0b. - -Signed-off-by: Fabian Vogt -Link: https://lore.kernel.org/r/2693091.mvXUDI8C0e@fabians-envy -Signed-off-by: Takashi Iwai -Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support") -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_realtek.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 00051c14e263a..57bd11c6057d5 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -7310,6 +7310,7 @@ enum { - ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, - ALC287_FIXUP_TAS2781_I2C, - ALC245_FIXUP_HP_MUTE_LED_COEFBIT, -+ ALC245_FIXUP_HP_X360_MUTE_LEDS, - }; - - /* A special fixup for Lenovo C940 and Yoga Duet 7; -@@ -9398,6 +9399,12 @@ static const struct hda_fixup alc269_fixups[] = { - .type = HDA_FIXUP_FUNC, - .v.func = alc245_fixup_hp_mute_led_coefbit, - }, -+ [ALC245_FIXUP_HP_X360_MUTE_LEDS] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc245_fixup_hp_mute_led_coefbit, -+ .chained = true, -+ .chain_id = ALC245_FIXUP_HP_GPIO_LED -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -9640,6 +9647,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), - SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), - SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2), -+ SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS), - SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED), - SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), --- -2.40.1 - diff --git a/queue-6.5/series b/queue-6.5/series index 65db913b121..887c2b3a3af 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -1,6 +1,5 @@ alsa-hda-tas2781-add-tas2781-hda-driver.patch alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch -alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch