[kernel/f20] Backport two patches to fix T440s dock audio (rhbz 1101386)

Sat Aug 2 14:02:32 UTC 2014

commit 2810618300cb75c0944cd450dedc8ee6a6bd7317
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Sat Aug 2 10:02:20 2014 -0400

    Backport two patches to fix T440s dock audio (rhbz 1101386)

 ...hda-Add-dock-pin-setups-for-Thinkpad-T440.patch |   71 ++++++++++++++++++++
 0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch |   32 +++++++++
 kernel.spec                                        |   11 +++
 3 files changed, 114 insertions(+), 0 deletions(-)
---

diff --git a/0001-ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440.patch b/0001-ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440.patch
new file mode 100644
index 0000000..379e436
--- /dev/null
+++ b/0001-ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440.patch
@@ -0,0 +1,71 @@
+Bugzilla: 1101386
+Upstream-status: 3.16
+
+From 4d4b199b5119389995418db555fa08b53142a58d Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai at suse.de>
+Date: Tue, 6 May 2014 17:34:42 +0200
+Subject: [PATCH 1/2] ALSA: hda - Add dock pin setups for Thinkpad T440
+
+The headphone and mic jacks on Thinkpad T440 are assigned to pins NID
+0x16 and 0x19, respectively.  These need to be set up manually by a
+fixup.
+
+Reported-and-tested-by: Joschi Brauchle <joschi.brauchle at tum.de>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+
+Conflicts:
+	sound/pci/hda/patch_realtek.c
+---
+ sound/pci/hda/patch_realtek.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 10014ed541cf..007dd0d4442e 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4158,6 +4158,7 @@ enum {
+ 	ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
+ 	ALC255_FIXUP_HEADSET_MODE,
+ 	ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,
++	ALC292_FIXUP_TPT440_DOCK,
+ };
+ 
+ static const struct hda_fixup alc269_fixups[] = {
+@@ -4558,6 +4559,16 @@ static const struct hda_fixup alc269_fixups[] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		.v.func = alc_fixup_headset_mode_alc255_no_hp_mic,
+ 	},
++	[ALC292_FIXUP_TPT440_DOCK] = {
++		.type = HDA_FIXUP_PINS,
++		.v.pins = (const struct hda_pintbl[]) {
++			{ 0x16, 0x21211010 }, /* dock headphone */
++			{ 0x19, 0x21a11010 }, /* dock mic */
++			{ }
++		},
++		.chained = true,
++		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
++	},
+ };
+ 
+ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -4736,7 +4747,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),
+-	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
++	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),
++	SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+@@ -4814,6 +4826,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
+ 	{.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},
+ 	{.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
+ 	{.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
++	{.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
+ 	{}
+ };
+ 
+-- 
+1.9.3
+
diff --git a/0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch b/0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch
new file mode 100644
index 0000000..d3b7168
--- /dev/null
+++ b/0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch
@@ -0,0 +1,32 @@
+Bugzilla: 1101386
+Upstream-status: 3.16
+
+From 96e3196e400cab89aeaedb247a748e254fb8b11f Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai at suse.de>
+Date: Fri, 27 Jun 2014 12:14:35 +0200
+Subject: [PATCH 2/2] ALSA: hda - Add a fixup for Thinkpad T540p
+
+The similar fixup as T440 is needed for supporting the dock on T540.
+
+Reported-by: Jim Minter <jminter at redhat.com>
+Cc: <stable at vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/patch_realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 007dd0d4442e..9d2b45524be8 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4749,6 +4749,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),
++	SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK),
+ 	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+-- 
+1.9.3
+
diff --git a/kernel.spec b/kernel.spec
index 02f279f..1aeeaec 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -759,6 +759,10 @@ Patch25126: 0001-acpi-video-Add-video.use_native_backlight-1-for-HP-E.patch
 #rhbz 1121288
 Patch25127: 0001-xhci-Blacklist-using-streams-on-the-Etron-EJ168-cont.patch
 
+#rhbz 1101386
+Patch25128: 0001-ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440.patch
+Patch25129: 0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1477,6 +1481,10 @@ ApplyPatch 0001-acpi-video-Add-video.use_native_backlight-1-for-HP-E.patch
 #rhbz 1121288
 ApplyPatch 0001-xhci-Blacklist-using-streams-on-the-Etron-EJ168-cont.patch
 
+#rhbz 1101386
+ApplyPatch 0001-ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440.patch
+ApplyPatch 0002-ALSA-hda-Add-a-fixup-for-Thinkpad-T540p.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2288,6 +2296,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Aug 02 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Backport two patches to fix T440s dock audio (rhbz 1101386)
+
 * Thu Jul 31 2014 Justin M. Forbes <jforbes at fedoraproject.org> 3.15.8-200
 - Linux v3.15.8
 
