]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jan 2024 19:18:49 +0000 (11:18 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jan 2024 19:18:49 +0000 (11:18 -0800)
added patches:
alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch
alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch

queue-5.10/alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch [new file with mode: 0644]
queue-5.10/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch b/queue-5.10/alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch
new file mode 100644 (file)
index 0000000..72e9383
--- /dev/null
@@ -0,0 +1,35 @@
+From bc7863d18677df66b2c7a0e172c91296ff380f11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=87a=C4=9Fhan=20Demir?= <caghandemir@marun.edu.tr>
+Date: Mon, 15 Jan 2024 20:23:03 +0300
+Subject: ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq2xxx
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Çağhan Demir <caghandemir@marun.edu.tr>
+
+commit bc7863d18677df66b2c7a0e172c91296ff380f11 upstream.
+
+This HP Laptop uses ALC236 codec with COEF 0x07 idx 1 controlling
+the mute LED. This patch enables the already existing quirk for
+this device.
+
+Signed-off-by: Çağhan Demir <caghandemir@marun.edu.tr>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20240115172303.4718-1-caghandemir@marun.edu.tr
+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
+@@ -9034,6 +9034,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),
+       SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
+       SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
++      SND_PCI_QUIRK(0x103c, 0x87fe, "HP Laptop 15s-fq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+       SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
+       SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+       SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
diff --git a/queue-5.10/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch b/queue-5.10/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
new file mode 100644 (file)
index 0000000..4a0bff9
--- /dev/null
@@ -0,0 +1,35 @@
+From a03cfad512ac24a35184d7d87ec0d5489e1cb763 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 12 Jan 2024 12:10:23 +0100
+Subject: ALSA: oxygen: Fix right channel of capture volume mixer
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit a03cfad512ac24a35184d7d87ec0d5489e1cb763 upstream.
+
+There was a typo in oxygen mixer code that didn't update the right
+channel value properly for the capture volume.  Let's fix it.
+
+This trivial fix was originally reported on Bugzilla.
+
+Fixes: a3601560496d ("[ALSA] oxygen: add front panel controls")
+Cc: <stable@vger.kernel.org>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=156561
+Link: https://lore.kernel.org/r/20240112111023.6208-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/oxygen/oxygen_mixer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/oxygen/oxygen_mixer.c
++++ b/sound/pci/oxygen/oxygen_mixer.c
+@@ -718,7 +718,7 @@ static int ac97_fp_rec_volume_put(struct
+       oldreg = oxygen_read_ac97(chip, 1, AC97_REC_GAIN);
+       newreg = oldreg & ~0x0707;
+       newreg = newreg | (value->value.integer.value[0] & 7);
+-      newreg = newreg | ((value->value.integer.value[0] & 7) << 8);
++      newreg = newreg | ((value->value.integer.value[1] & 7) << 8);
+       change = newreg != oldreg;
+       if (change)
+               oxygen_write_ac97(chip, 1, AC97_REC_GAIN, newreg);
index 2c32b22a2c5ec745fb81c6ba29603f25621a902f..4cd2a0a18fc535a3306ac1dee52bfd9dc4ac987e 100644 (file)
@@ -217,3 +217,5 @@ revert-usb-typec-class-fix-typec_altmode_put_partner-to-put-plugs.patch
 usb-typec-class-fix-typec_altmode_put_partner-to-put-plugs.patch
 usb-mon-fix-atomicity-violation-in-mon_bin_vma_fault.patch
 serial-imx-ensure-that-imx_uart_rs485_config-is-called-with-enabled-clock.patch
+alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
+alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch