Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-12 22:18:26 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-12 22:21:17 +0100
commit856781cdd7c9b456c30f9324da490d55671e5bc6 (patch)
tree001150a45b6c3eec14418054dbd930cade68cf22
parentc18828c31b1eff86007a3cdbccd8ff598ed3fa6e (diff)
ALSA: hda/realtek - Headset microphone support for System76
darp5 (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.8-310-ALSA-hda-realtek-Headset-microphone-support-fo.patch66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.8-310-ALSA-hda-realtek-Headset-microphone-support-fo.patch b/patches.kernel.org/4.20.8-310-ALSA-hda-realtek-Headset-microphone-support-fo.patch
new file mode 100644
index 0000000000..f331250f7a
--- /dev/null
+++ b/patches.kernel.org/4.20.8-310-ALSA-hda-realtek-Headset-microphone-support-fo.patch
@@ -0,0 +1,66 @@
+From: Jeremy Soller <jeremy@system76.com>
+Date: Wed, 30 Jan 2019 16:12:31 -0700
+Subject: [PATCH] ALSA: hda/realtek - Headset microphone support for System76
+ darp5
+References: bnc#1012628
+Patch-mainline: 4.20.8
+Git-commit: 89e3a5682edaa4e5bb334719afb180256ac7bf78
+
+commit 89e3a5682edaa4e5bb334719afb180256ac7bf78 upstream.
+
+On the System76 Darter Pro (darp5), there is a headset microphone
+input attached to 0x1a that does not have a jack detect. In order to
+get it working, the pin configuration needs to be set correctly, and
+the ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC fixup needs to be applied.
+This is similar to the MIC_NO_PRESENCE fixups for some Dell laptops,
+except we have a separate microphone jack that is already configured
+correctly.
+
+Signed-off-by: Jeremy Soller <jeremy@system76.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ sound/pci/hda/patch_realtek.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 81bb02b2ff25..c1042df5e346 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5572,6 +5572,7 @@ enum {
+ ALC294_FIXUP_ASUS_MIC,
+ ALC294_FIXUP_ASUS_HEADSET_MIC,
+ ALC294_FIXUP_ASUS_SPK,
++ ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
+ };
+
+ static const struct hda_fixup alc269_fixups[] = {
+@@ -6496,6 +6497,15 @@ static const struct hda_fixup alc269_fixups[] = {
+ .chained = true,
+ .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
+ },
++ [ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = {
++ .type = HDA_FIXUP_PINS,
++ .v.pins = (const struct hda_pintbl[]) {
++ { 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */
++ { }
++ },
++ .chained = true,
++ .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
++ },
+ };
+
+ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -6674,6 +6684,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
+ SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
+ SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
++ SND_PCI_QUIRK(0x1558, 0x1325, "System76 Darter Pro (darp5)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+ SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),
+ SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
+ SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index ae972673f0..0ad0f6ba9f 100644
--- a/series.conf
+++ b/series.conf
@@ -1046,6 +1046,7 @@
patches.kernel.org/4.20.8-307-ALSA-hda-Serialize-codec-registrations.patch
patches.kernel.org/4.20.8-308-ALSA-hda-realtek-Fix-lose-hp_pins-for-disable-.patch
patches.kernel.org/4.20.8-309-ALSA-hda-realtek-Use-a-common-helper-for-hp-pi.patch
+ patches.kernel.org/4.20.8-310-ALSA-hda-realtek-Headset-microphone-support-fo.patch
########################################################
# Build fixes that apply to the vanilla kernel too.