From: Sasha Levin Date: Mon, 9 Oct 2023 17:37:46 +0000 (-0400) Subject: Drop alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch X-Git-Tag: v4.14.327~18^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e70932db93f399257bf1738bb127968bc60dc673;p=thirdparty%2Fkernel%2Fstable-queue.git Drop alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch b/queue-6.1/alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch deleted file mode 100644 index 71b78ebc37b..00000000000 --- a/queue-6.1/alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5ecc09ed8ee97b25ce54ed8b04f58ded5529bbfe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 23 Aug 2023 20:40:51 +0900 -Subject: ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute - LED - -From: SungHwan Jung - -[ Upstream commit 93dc18e11b1ab2d485b69f91c973e6b83e47ebd0 ] - -This quirk enables mute LED on HP Victus 16-d1xxx (8A25) laptops, which -use ALC245 codec. - -Signed-off-by: SungHwan Jung -Link: https://lore.kernel.org/r/20230823114051.3921-1-onenowy@gmail.com -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 | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 7d549229d0b95..e81bc0c026eba 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -4639,6 +4639,22 @@ static void alc236_fixup_hp_mute_led_coefbit2(struct hda_codec *codec, - } - } - -+static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec, -+ const struct hda_fixup *fix, -+ int action) -+{ -+ struct alc_spec *spec = codec->spec; -+ -+ if (action == HDA_FIXUP_ACT_PRE_PROBE) { -+ spec->mute_led_polarity = 0; -+ spec->mute_led_coef.idx = 0x0b; -+ spec->mute_led_coef.mask = 3 << 2; -+ spec->mute_led_coef.on = 2 << 2; -+ spec->mute_led_coef.off = 1 << 2; -+ snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set); -+ } -+} -+ - /* turn on/off mic-mute LED per capture hook by coef bit */ - static int coef_micmute_led_set(struct led_classdev *led_cdev, - enum led_brightness brightness) -@@ -7289,6 +7305,7 @@ enum { - ALC236_FIXUP_DELL_DUAL_CODECS, - ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, - ALC287_FIXUP_TAS2781_I2C, -+ ALC245_FIXUP_HP_MUTE_LED_COEFBIT, - }; - - /* A special fixup for Lenovo C940 and Yoga Duet 7; -@@ -9364,6 +9381,10 @@ static const struct hda_fixup alc269_fixups[] = { - .chained = true, - .chain_id = ALC269_FIXUP_THINKPAD_ACPI, - }, -+ [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc245_fixup_hp_mute_led_coefbit, -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -9630,6 +9651,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), - SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), -+ SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT), - SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), - SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED), --- -2.40.1 - diff --git a/queue-6.1/series b/queue-6.1/series index a31ccaa13e4..cb968ada877 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,7 +1,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 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-hp-victus-16-d1xxx-to.patch b/queue-6.5/alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch deleted file mode 100644 index 7d6d815fb87..00000000000 --- a/queue-6.5/alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8a354d8b6952e9b4949d0c0cd618abd764cc9f48 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 23 Aug 2023 20:40:51 +0900 -Subject: ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute - LED - -From: SungHwan Jung - -[ Upstream commit 93dc18e11b1ab2d485b69f91c973e6b83e47ebd0 ] - -This quirk enables mute LED on HP Victus 16-d1xxx (8A25) laptops, which -use ALC245 codec. - -Signed-off-by: SungHwan Jung -Link: https://lore.kernel.org/r/20230823114051.3921-1-onenowy@gmail.com -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 | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index ccf99f881cc4f..00051c14e263a 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -4639,6 +4639,22 @@ static void alc236_fixup_hp_mute_led_coefbit2(struct hda_codec *codec, - } - } - -+static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec, -+ const struct hda_fixup *fix, -+ int action) -+{ -+ struct alc_spec *spec = codec->spec; -+ -+ if (action == HDA_FIXUP_ACT_PRE_PROBE) { -+ spec->mute_led_polarity = 0; -+ spec->mute_led_coef.idx = 0x0b; -+ spec->mute_led_coef.mask = 3 << 2; -+ spec->mute_led_coef.on = 2 << 2; -+ spec->mute_led_coef.off = 1 << 2; -+ snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set); -+ } -+} -+ - /* turn on/off mic-mute LED per capture hook by coef bit */ - static int coef_micmute_led_set(struct led_classdev *led_cdev, - enum led_brightness brightness) -@@ -7293,6 +7309,7 @@ enum { - ALC236_FIXUP_DELL_DUAL_CODECS, - ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, - ALC287_FIXUP_TAS2781_I2C, -+ ALC245_FIXUP_HP_MUTE_LED_COEFBIT, - }; - - /* A special fixup for Lenovo C940 and Yoga Duet 7; -@@ -9377,6 +9394,10 @@ static const struct hda_fixup alc269_fixups[] = { - .chained = true, - .chain_id = ALC269_FIXUP_THINKPAD_ACPI, - }, -+ [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc245_fixup_hp_mute_led_coefbit, -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -9650,6 +9671,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), - SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), -+ SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT), - SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), - SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED), --- -2.40.1 - diff --git a/queue-6.5/series b/queue-6.5/series index 887c2b3a3af..717376849ae 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -1,5 +1,4 @@ alsa-hda-tas2781-add-tas2781-hda-driver.patch -alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.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