--- /dev/null
+From af95b41426e0b58279f8ff0ebe420df49a4e96b8 Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Thu, 26 Mar 2015 17:14:55 +0800
+Subject: ALSA: hda - Add one more node in the EAPD supporting candidate list
+
+From: Hui Wang <hui.wang@canonical.com>
+
+commit af95b41426e0b58279f8ff0ebe420df49a4e96b8 upstream.
+
+We have a HP machine which use the codec node 0x17 connecting the
+internal speaker, and from the node capability, we saw the EAPD,
+if we don't set the EAPD on for this node, the internal speaker
+can't output any sound.
+
+BugLink: https://bugs.launchpad.net/bugs/1436745
+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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -271,7 +271,7 @@ static void alc_auto_setup_eapd(struct h
+ {
+ /* We currently only handle front, HP */
+ static hda_nid_t pins[] = {
+- 0x0f, 0x10, 0x14, 0x15, 0
++ 0x0f, 0x10, 0x14, 0x15, 0x17, 0
+ };
+ hda_nid_t *p;
+ for (p = pins; *p; p++)
--- /dev/null
+From cc7016ab1a22fb26f388c2fb2b692b89897cbc3e Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 8 Apr 2015 20:47:55 +0200
+Subject: ALSA: hda - Fix headphone pin config for Lifebook T731
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit cc7016ab1a22fb26f388c2fb2b692b89897cbc3e upstream.
+
+Some BIOS version of Fujitsu Lifebook T731 seems to set up the
+headphone pin (0x21) without the assoc number 0x0f while it's set only
+to the output on the docking port (0x1a). With the recent commit
+[03ad6a8c93b6: ALSA: hda - Fix "PCM" name being used on one DAC when
+ there are two DACs], this resulted in the weird mixer element
+mapping where the headphone on the laptop is assigned as a shared
+volume with the speaker and the docking port is assigned as an
+individual headphone.
+
+This patch improves the situation by correcting the headphone pin
+config to the more appropriate value.
+
+Reported-and-tested-by: Taylor Smock <smocktaylor@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -3953,6 +3953,7 @@ enum {
+ ALC269_FIXUP_QUANTA_MUTE,
+ ALC269_FIXUP_LIFEBOOK,
+ ALC269_FIXUP_LIFEBOOK_EXTMIC,
++ ALC269_FIXUP_LIFEBOOK_HP_PIN,
+ ALC269_FIXUP_AMIC,
+ ALC269_FIXUP_DMIC,
+ ALC269VB_FIXUP_AMIC,
+@@ -4087,6 +4088,13 @@ static const struct hda_fixup alc269_fix
+ { }
+ },
+ },
++ [ALC269_FIXUP_LIFEBOOK_HP_PIN] = {
++ .type = HDA_FIXUP_PINS,
++ .v.pins = (const struct hda_pintbl[]) {
++ { 0x21, 0x0221102f }, /* HP out */
++ { }
++ },
++ },
+ [ALC269_FIXUP_AMIC] = {
+ .type = HDA_FIXUP_PINS,
+ .v.pins = (const struct hda_pintbl[]) {
+@@ -4540,6 +4548,7 @@ static const struct snd_pci_quirk alc269
+ SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
+ SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
+ SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
++ SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),
+ SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
+ SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
+ SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
--- /dev/null
+From a59d7199f62b8336570972dcc288321d0ec999fe Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 8 Apr 2015 16:34:00 +0800
+Subject: ALSA: hda/realtek - Make more stable to get pin sense for ALC283
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit a59d7199f62b8336570972dcc288321d0ec999fe upstream.
+
+Pin sense will active when power pin is wake up.
+Power pin will not wake up immediately during resume state.
+Add some delay to wait for power pin activated.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -2885,6 +2885,8 @@ static void alc283_init(struct hda_codec
+
+ if (!hp_pin)
+ return;
++
++ msleep(30);
+ hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+
+ /* Index 0x43 Direct Drive HP AMP LPM Control 1 */
--- /dev/null
+From 3dc8523fa7412e731441c01fb33f003eb3cfece1 Mon Sep 17 00:00:00 2001
+From: "Dmitry M. Fedin" <dmitry.fedin@gmail.com>
+Date: Thu, 9 Apr 2015 17:37:03 +0300
+Subject: ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support
+
+From: "Dmitry M. Fedin" <dmitry.fedin@gmail.com>
+
+commit 3dc8523fa7412e731441c01fb33f003eb3cfece1 upstream.
+
+Adds an entry for Creative USB X-Fi to the rc_config array in
+mixer_quirks.c to allow use of volume knob on the device.
+Adds support for newer X-Fi Pro card, known as "Model No. SB1095"
+with USB ID "041e:3237"
+
+Signed-off-by: Dmitry M. Fedin <dmitry.fedin@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/usb/mixer_quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/mixer_quirks.c
++++ b/sound/usb/mixer_quirks.c
+@@ -178,6 +178,7 @@ static const struct rc_config {
+ { USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */
+ { USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */
+ { USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
++ { USB_ID(0x041e, 0x3237), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
+ { USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */
+ };
+
-alsa-hda-add-dock-support-for-thinkpad-t450s-17aa-5036.patch
alsa-hda-add-one-more-node-in-the-eapd-supporting-candidate-list.patch
alsa-usb-creative-usb-x-fi-pro-sb1095-volume-knob-support.patch
alsa-hda-realtek-make-more-stable-to-get-pin-sense-for-alc283.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
