Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:27 +0100
committerJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:31 +0100
commita5ad13ae6049a3a04262c637d433cd3ca67ae3f5 (patch)
treee2d5b8a575fb17ed8e6ea4e08c8ba909af89f6fa
parentfca27839348e847ac64e6c94dd7fec199b6630f0 (diff)
ALSA: hda/realtek - Disable headset Mic VREF for headset mode
of ALC225 (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.3-011-ALSA-hda-realtek-Disable-headset-Mic-VREF-for-.patch75
-rw-r--r--series.conf1
2 files changed, 76 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.3-011-ALSA-hda-realtek-Disable-headset-Mic-VREF-for-.patch b/patches.kernel.org/4.20.3-011-ALSA-hda-realtek-Disable-headset-Mic-VREF-for-.patch
new file mode 100644
index 0000000000..1f38b1f4e2
--- /dev/null
+++ b/patches.kernel.org/4.20.3-011-ALSA-hda-realtek-Disable-headset-Mic-VREF-for-.patch
@@ -0,0 +1,75 @@
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 9 Jan 2019 17:05:24 +0800
+Subject: [PATCH] ALSA: hda/realtek - Disable headset Mic VREF for headset mode
+ of ALC225
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: d1dd42110d2727e81b9265841a62bc84c454c3a2
+
+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>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ sound/pci/hda/patch_realtek.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index d3f1aac41952..0d95316d6dbd 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5381,6 +5381,13 @@ static void alc285_fixup_invalidate_dacs(struct hda_codec *codec,
+ 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_fixups[] = {
+ .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_fixups[] = {
+ {}
+ },
+ .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,
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index c01f06e29c..69aa06e9df 100644
--- a/series.conf
+++ b/series.conf
@@ -248,6 +248,7 @@
patches.kernel.org/4.20.3-008-x86-modpost-Replace-last-remnants-of-RETPOLINE.patch
patches.kernel.org/4.20.3-009-ALSA-hda-realtek-Support-Dell-headset-mode-for.patch
patches.kernel.org/4.20.3-010-ALSA-hda-realtek-Add-unplug-function-into-unpl.patch
+ patches.kernel.org/4.20.3-011-ALSA-hda-realtek-Disable-headset-Mic-VREF-for-.patch
########################################################
# Build fixes that apply to the vanilla kernel too.