From: Greg Kroah-Hartman Date: Tue, 24 Jun 2014 14:23:55 +0000 (-0400) Subject: 3.14-stable patches X-Git-Tag: v3.4.95~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22b142a1f005ef0692e66887eb23419b4eb10bd9;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch alsa-hda-realtek-add-support-of-alc891-codec.patch --- diff --git a/queue-3.14/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch b/queue-3.14/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch new file mode 100644 index 00000000000..47ae1489817 --- /dev/null +++ b/queue-3.14/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch @@ -0,0 +1,37 @@ +From 2bd0ae464a6cf7363bbf72c8545e0aa43caa57f0 Mon Sep 17 00:00:00 2001 +From: "Wang, Xiaoming" +Date: Thu, 12 Jun 2014 18:47:07 -0400 +Subject: ALSA: compress: Cancel the optimization of compiler and fix + the size of struct for all platform. + +From: "Wang, Xiaoming" + +commit 2bd0ae464a6cf7363bbf72c8545e0aa43caa57f0 upstream. + +Cancel the optimization of compiler for struct snd_compr_avail +which size will be 0x1c in 32bit kernel while 0x20 in 64bit +kernel under the optimizer. That will make compaction between +32bit and 64bit. So add packed to fix the size of struct +snd_compr_avail to 0x1c for all platform. + +Signed-off-by: Zhang Dongxing +Signed-off-by: xiaoming wang +Acked-by: Vinod Koul +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/sound/compress_offload.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/uapi/sound/compress_offload.h ++++ b/include/uapi/sound/compress_offload.h +@@ -80,7 +80,7 @@ struct snd_compr_tstamp { + struct snd_compr_avail { + __u64 avail; + struct snd_compr_tstamp tstamp; +-}; ++} __attribute__((packed)); + + enum snd_compr_direction { + SND_COMPRESS_PLAYBACK = 0, diff --git a/queue-3.14/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch b/queue-3.14/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch new file mode 100644 index 00000000000..44d057714ad --- /dev/null +++ b/queue-3.14/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch @@ -0,0 +1,59 @@ +From 2041d56464a067461d7cc21734a0f024587ed2ff Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Fri, 13 Jun 2014 11:15:44 +0200 +Subject: ALSA: hda - Add quirk for external mic on Lifebook U904 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: David Henningsson + +commit 2041d56464a067461d7cc21734a0f024587ed2ff upstream. + +According to the bug reporter (Данило Шеган), the external mic +starts to work and has proper jack detection if only pin 0x19 +is marked properly as an external headset mic. + +AlsaInfo at https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1328587/+attachment/4128991/+files/AlsaInfo.txt + +BugLink: https://bugs.launchpad.net/bugs/1328587 +Signed-off-by: David Henningsson +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -3932,6 +3932,7 @@ enum { + ALC269_FIXUP_HEADSET_MIC, + ALC269_FIXUP_QUANTA_MUTE, + ALC269_FIXUP_LIFEBOOK, ++ ALC269_FIXUP_LIFEBOOK_EXTMIC, + ALC269_FIXUP_AMIC, + ALC269_FIXUP_DMIC, + ALC269VB_FIXUP_AMIC, +@@ -4059,6 +4060,13 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC269_FIXUP_QUANTA_MUTE + }, ++ [ALC269_FIXUP_LIFEBOOK_EXTMIC] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x19, 0x01a1903c }, /* headset mic, with jack detect */ ++ { } ++ }, ++ }, + [ALC269_FIXUP_AMIC] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { +@@ -4510,6 +4518,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, 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), + SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), diff --git a/queue-3.14/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch b/queue-3.14/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch new file mode 100644 index 00000000000..2cf8e6ea003 --- /dev/null +++ b/queue-3.14/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch @@ -0,0 +1,57 @@ +From 8a02b164d4bfac108bfe37e98108bff1e062bd3d Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Fri, 13 Jun 2014 17:16:31 +0800 +Subject: ALSA: hda/realtek - Add more entry for enable HP mute led + +From: Kailang Yang + +commit 8a02b164d4bfac108bfe37e98108bff1e062bd3d upstream. + +More HP machine need mute led support. + +Signed-off-by: Kailang Yang +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4427,14 +4427,24 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED), + /* ALC282 */ ++ SND_PCI_QUIRK(0x103c, 0x220d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x220e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x220f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2210, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2211, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2212, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x2213, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2214, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x2266, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x2267, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x2268, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x2269, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x226a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x226c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x226d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x226f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x227a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x227b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), +@@ -4474,6 +4484,10 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x22c3, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2334, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), ++ SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), + SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), + SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), diff --git a/queue-3.14/alsa-hda-realtek-add-support-of-alc891-codec.patch b/queue-3.14/alsa-hda-realtek-add-support-of-alc891-codec.patch new file mode 100644 index 00000000000..d8da23b614b --- /dev/null +++ b/queue-3.14/alsa-hda-realtek-add-support-of-alc891-codec.patch @@ -0,0 +1,29 @@ +From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Thu, 5 Jun 2014 11:13:44 +0800 +Subject: ALSA: hda/realtek - Add support of ALC891 codec + +From: Kailang Yang + +commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream. + +New codec support for ALC891. + +Signed-off-by: Kailang Yang +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -5536,6 +5536,7 @@ static const struct hda_codec_preset snd + { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 }, + { .id = 0x10ec0671, .name = "ALC671", .patch = patch_alc662 }, + { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 }, ++ { .id = 0x10ec0867, .name = "ALC891", .patch = patch_alc882 }, + { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 }, + { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 }, + { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 }, diff --git a/queue-3.14/series b/queue-3.14/series index 14806e51b42..425085c6387 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -57,3 +57,7 @@ iio-fix-endianness-issue-in-ak8975_read_axis.patch iio-fix-two-mpl3115-issues-in-measurement-conversion.patch lzo-properly-check-for-overruns.patch lz4-ensure-length-does-not-wrap.patch +alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch +alsa-hda-realtek-add-support-of-alc891-codec.patch +alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch +alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch