4.7-stable patches

added patches:
	alsa-hda-add-the-top-speaker-pin-config-for-hp-spectre-x360.patch
	alsa-hda-fix-headset-mic-detection-problem-for-several-dell-laptops.patch

diff --git a/queue-4.7/alsa-hda-add-the-top-speaker-pin-config-for-hp-spectre-x360.patch b/queue-4.7/alsa-hda-add-the-top-speaker-pin-config-for-hp-spectre-x360.patch
new file mode 100644 (file)
index 0000000..2574cbf
--- /dev/null
+++ b/queue-4.7/alsa-hda-add-the-top-speaker-pin-config-for-hp-spectre-x360.patch
@@ -0,0 +1,57 @@
+From 0eec880966e77bdbee0112989a2be67d92e39929 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 27 Sep 2016 16:44:49 +0200
+Subject: ALSA: hda - Add the top speaker pin config for HP Spectre x360
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 0eec880966e77bdbee0112989a2be67d92e39929 upstream.
+
+HP Spectre x360 with CX20724 codec has two speaker outputs while the
+BIOS sets up only the bottom one (NID 0x17) and disables the top one
+(NID 0x1d).
+
+This patch adds a fixup simply defining the proper pincfg for NID 0x1d
+so that the top speaker works as is.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=169071
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -261,6 +261,7 @@ enum {
+       CXT_FIXUP_HP_530,
+       CXT_FIXUP_CAP_MIX_AMP_5047,
+       CXT_FIXUP_MUTE_LED_EAPD,
++      CXT_FIXUP_HP_SPECTRE,
+ };
+ 
+ /* for hda_fixup_thinkpad_acpi() */
+@@ -765,6 +766,14 @@ static const struct hda_fixup cxt_fixups
+               .type = HDA_FIXUP_FUNC,
+               .v.func = cxt_fixup_mute_led_eapd,
+       },
++      [CXT_FIXUP_HP_SPECTRE] = {
++              .type = HDA_FIXUP_PINS,
++              .v.pins = (const struct hda_pintbl[]) {
++                      /* enable NID 0x1d for the speaker on top */
++                      { 0x1d, 0x91170111 },
++                      { }
++              }
++      },
+ };
+ 
+ static const struct snd_pci_quirk cxt5045_fixups[] = {
+@@ -814,6 +823,7 @@ static const struct snd_pci_quirk cxt506
+       SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),
+       SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC),
+       SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC),
++      SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE),
+       SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
+       SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),
+       SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

diff --git a/queue-4.7/alsa-hda-fix-headset-mic-detection-problem-for-several-dell-laptops.patch b/queue-4.7/alsa-hda-fix-headset-mic-detection-problem-for-several-dell-laptops.patch
new file mode 100644 (file)
index 0000000..530ea57
--- /dev/null
+++ b/queue-4.7/alsa-hda-fix-headset-mic-detection-problem-for-several-dell-laptops.patch
@@ -0,0 +1,59 @@
+From 3f640970a41429f0a076c01270bbd014c9eae61c Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Sun, 11 Sep 2016 11:26:16 +0800
+Subject: ALSA: hda - Fix headset mic detection problem for several Dell laptops
+
+From: Hui Wang <hui.wang@canonical.com>
+
+commit 3f640970a41429f0a076c01270bbd014c9eae61c upstream.
+
+One of the laptops has the codec ALC256 on it, applying the
+ALC255_FIXUP_DELL1_MIC_NO_PRESENCE can fix the problem, the rest
+of laptops have the codec ALC295 on them, they are similar to machines
+with ALC225, applying the ALC269_FIXUP_DELL1_MIC_NO_PRESENCE can fix
+the problem.
+
+Signed-off-by: Hui Wang <hui.wang@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5790,6 +5790,13 @@ static const struct hda_model_fixup alc2
+       {0x14, 0x90170110}, \
+       {0x15, 0x0221401f}
+ 
++#define ALC295_STANDARD_PINS \
++      {0x12, 0xb7a60130}, \
++      {0x14, 0x90170110}, \
++      {0x17, 0x21014020}, \
++      {0x18, 0x21a19030}, \
++      {0x21, 0x04211020}
++
+ #define ALC298_STANDARD_PINS \
+       {0x12, 0x90a60130}, \
+       {0x21, 0x03211020}
+@@ -5899,6 +5906,10 @@ static const struct snd_hda_pin_quirk al
+               {0x14, 0x90170120},
+               {0x21, 0x02211030}),
+       SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
++              {0x12, 0xb7a60130},
++              {0x14, 0x90170110},
++              {0x21, 0x02211020}),
++      SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC256_STANDARD_PINS),
+       SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
+               {0x12, 0x90a60130},
+@@ -6009,6 +6020,8 @@ static const struct snd_hda_pin_quirk al
+       SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
+               {0x13, 0x90a60140}),
++      SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
++              ALC295_STANDARD_PINS),
+       SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC298_STANDARD_PINS,
+               {0x17, 0x90170110}),

diff --git a/queue-4.7/series b/queue-4.7/series
index 8c3b15365928c917efdc4f574fa214e979d30354..bc71c54573d331c8d6e3a33bb05d55b158e07178 100644 (file)
--- a/queue-4.7/series
+++ b/queue-4.7/series
@@ -137,3 +137,5 @@ usb-usbip-vudc-fix-left-shift-overflow.patch
 usb-serial-cp210x-add-id-for-a-juniper-console.patch
 revert-usbtmc-convert-to-devm_kzalloc.patch
 alsa-hda-adding-one-more-alc255-pin-definition-for-headset-problem.patch
+alsa-hda-fix-headset-mic-detection-problem-for-several-dell-laptops.patch
+alsa-hda-add-the-top-speaker-pin-config-for-hp-spectre-x360.patch