4.20-stable patches

added patches:
	alsa-hda-realtek-add-unplug-function-into-unplug-state-of-headset-mode-for-alc225.patch
	alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch
	alsa-hda-realtek-support-dell-headset-mode-for-new-aio-platform.patch

diff --git a/queue-4.20/alsa-hda-realtek-add-unplug-function-into-unplug-state-of-headset-mode-for-alc225.patch b/queue-4.20/alsa-hda-realtek-add-unplug-function-into-unplug-state-of-headset-mode-for-alc225.patch
new file mode 100644 (file)
index 0000000..bbd1e72
--- /dev/null
+++ b/queue-4.20/alsa-hda-realtek-add-unplug-function-into-unplug-state-of-headset-mode-for-alc225.patch
@@ -0,0 +1,31 @@
+From 4d4b0c52bde470c379f5d168d5c139ad866cb808 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 9 Jan 2019 16:23:37 +0800
+Subject: ALSA: hda/realtek - Add unplug function into unplug state of Headset Mode for ALC225
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit 4d4b0c52bde470c379f5d168d5c139ad866cb808 upstream.
+
+Forgot to add unplug function to unplug state of headset mode
+for ALC225.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+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
+@@ -4102,6 +4102,7 @@ static void alc_headset_mode_unplugged(s
+       case 0x10ec0295:
+       case 0x10ec0289:
+       case 0x10ec0299:
++              alc_process_coef_fw(codec, alc225_pre_hsmode);
+               alc_process_coef_fw(codec, coef0225);
+               break;
+       case 0x10ec0867:

diff --git a/queue-4.20/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch b/queue-4.20/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch
new file mode 100644 (file)
index 0000000..491ae7f
--- /dev/null
+++ b/queue-4.20/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch
@@ -0,0 +1,69 @@
+From d1dd42110d2727e81b9265841a62bc84c454c3a2 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 9 Jan 2019 17:05:24 +0800
+Subject: ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit d1dd42110d2727e81b9265841a62bc84c454c3a2 upstream.
+
+Disable Headset Mic VREF for headset mode of ALC225.
+This will be controlled by coef bits of headset mode functions.
+
+[ Fixed a compile warning and code simplification -- tiwai ]
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5381,6 +5381,13 @@ static void alc285_fixup_invalidate_dacs
+       snd_hda_override_wcaps(codec, 0x03, 0);
+ }
+ 
++static void alc_fixup_disable_mic_vref(struct hda_codec *codec,
++                                const struct hda_fixup *fix, int action)
++{
++      if (action == HDA_FIXUP_ACT_PRE_PROBE)
++              snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
++}
++
+ /* for hda_fixup_thinkpad_acpi() */
+ #include "thinkpad_helper.c"
+ 
+@@ -5493,6 +5500,7 @@ enum {
+       ALC293_FIXUP_LENOVO_SPK_NOISE,
+       ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
+       ALC255_FIXUP_DELL_SPK_NOISE,
++      ALC225_FIXUP_DISABLE_MIC_VREF,
+       ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
+       ALC295_FIXUP_DISABLE_DAC3,
+       ALC280_FIXUP_HP_HEADSET_MIC,
+@@ -6192,6 +6200,12 @@ static const struct hda_fixup alc269_fix
+               .chained = true,
+               .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
+       },
++      [ALC225_FIXUP_DISABLE_MIC_VREF] = {
++              .type = HDA_FIXUP_FUNC,
++              .v.func = alc_fixup_disable_mic_vref,
++              .chained = true,
++              .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
++      },
+       [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+               .type = HDA_FIXUP_VERBS,
+               .v.verbs = (const struct hda_verb[]) {
+@@ -6201,7 +6215,7 @@ static const struct hda_fixup alc269_fix
+                       {}
+               },
+               .chained = true,
+-              .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
++              .chain_id = ALC225_FIXUP_DISABLE_MIC_VREF
+       },
+       [ALC280_FIXUP_HP_HEADSET_MIC] = {
+               .type = HDA_FIXUP_FUNC,

diff --git a/queue-4.20/alsa-hda-realtek-support-dell-headset-mode-for-new-aio-platform.patch b/queue-4.20/alsa-hda-realtek-support-dell-headset-mode-for-new-aio-platform.patch
new file mode 100644 (file)
index 0000000..3b22400
--- /dev/null
+++ b/queue-4.20/alsa-hda-realtek-support-dell-headset-mode-for-new-aio-platform.patch
@@ -0,0 +1,31 @@
+From c2a7c55a04065c3b0c32d23b099db7ea1dbf6250 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Thu, 3 Jan 2019 15:53:39 +0800
+Subject: ALSA: hda/realtek - Support Dell headset mode for New AIO platform
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit c2a7c55a04065c3b0c32d23b099db7ea1dbf6250 upstream.
+
+Dell has new platform for ALC274.
+This will support to enable headset mode.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+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
+@@ -6503,6 +6503,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),
++      SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
+       SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

diff --git a/queue-4.20/series b/queue-4.20/series
index 93162ab92a3b8bd3c47735274d8d7efe8dbf3c4f..6e7d9912f4c7e02408005fc7857b6a5f7b19ad67 100644 (file)
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -6,3 +6,6 @@ staging-rtl8188eu-fix-module-loading-from-tasklet-for-wep-encryption.patch
 cpufreq-scpi-scmi-fix-freeing-of-dynamic-opps.patch
 cpufreq-scmi-fix-frequency-invariance-in-slow-path.patch
 x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch
+alsa-hda-realtek-support-dell-headset-mode-for-new-aio-platform.patch
+alsa-hda-realtek-add-unplug-function-into-unplug-state-of-headset-mode-for-alc225.patch
+alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch