]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:23:42 +0000 (10:23 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:23:42 +0000 (10:23 -0400)
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-support-of-alc891-codec.patch

queue-3.10/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch [new file with mode: 0644]
queue-3.10/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch [new file with mode: 0644]
queue-3.10/alsa-hda-realtek-add-support-of-alc891-codec.patch [new file with mode: 0644]
queue-3.10/series

diff --git a/queue-3.10/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch b/queue-3.10/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch
new file mode 100644 (file)
index 0000000..47ae148
--- /dev/null
@@ -0,0 +1,37 @@
+From 2bd0ae464a6cf7363bbf72c8545e0aa43caa57f0 Mon Sep 17 00:00:00 2001
+From: "Wang, Xiaoming" <xiaoming.wang@intel.com>
+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" <xiaoming.wang@intel.com>
+
+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 <dongxing.zhang@intel.com>
+Signed-off-by: xiaoming wang <xiaoming.wang@intel.com>
+Acked-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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.10/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch b/queue-3.10/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch
new file mode 100644 (file)
index 0000000..5059be9
--- /dev/null
@@ -0,0 +1,59 @@
+From 2041d56464a067461d7cc21734a0f024587ed2ff Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+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 <david.henningsson@canonical.com>
+
+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 <david.henningsson@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 |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -3356,6 +3356,7 @@ enum {
+       ALC269_FIXUP_STEREO_DMIC,
+       ALC269_FIXUP_QUANTA_MUTE,
+       ALC269_FIXUP_LIFEBOOK,
++      ALC269_FIXUP_LIFEBOOK_EXTMIC,
+       ALC269_FIXUP_AMIC,
+       ALC269_FIXUP_DMIC,
+       ALC269VB_FIXUP_AMIC,
+@@ -3463,6 +3464,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[]) {
+@@ -3713,6 +3721,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),
+       SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
+       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.10/alsa-hda-realtek-add-support-of-alc891-codec.patch b/queue-3.10/alsa-hda-realtek-add-support-of-alc891-codec.patch
new file mode 100644 (file)
index 0000000..3a8f5b0
--- /dev/null
@@ -0,0 +1,29 @@
+From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Thu, 5 Jun 2014 11:13:44 +0800
+Subject: ALSA: hda/realtek - Add support of ALC891 codec
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream.
+
+New codec support for ALC891.
+
+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 |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4664,6 +4664,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 },
index a8ba1c3b27b8f390da3fc7a01ec6f0128d98b898..b6e086d4df0772032a73f72c25b89e1e7d972860 100644 (file)
@@ -42,3 +42,6 @@ iio-adc-at91-signedness-bug-in-at91_adc_get_trigger_value_by_name.patch
 iio-fix-endianness-issue-in-ak8975_read_axis.patch
 lzo-properly-check-for-overruns.patch
 nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch
+alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch
+alsa-hda-realtek-add-support-of-alc891-codec.patch
+alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch