From: Greg Kroah-Hartman Date: Wed, 19 Mar 2014 23:50:07 +0000 (+0000) Subject: 3.10-stable patches X-Git-Tag: v3.4.84~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43c20f1f96e0f9339bd44904c6d8a4fd21e3e456;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: alsa-hda-added-inverted-digital-mic-handling-for-acer-travelmate-8371.patch alsa-hda-add-missing-loopback-merge-path-for-ad1884-1984-codecs.patch alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch --- diff --git a/queue-3.10/alsa-hda-add-missing-loopback-merge-path-for-ad1884-1984-codecs.patch b/queue-3.10/alsa-hda-add-missing-loopback-merge-path-for-ad1884-1984-codecs.patch new file mode 100644 index 00000000000..1d8bbe5a55a --- /dev/null +++ b/queue-3.10/alsa-hda-add-missing-loopback-merge-path-for-ad1884-1984-codecs.patch @@ -0,0 +1,30 @@ +From c5eda4c1bf6214332c46fb2f4e7c42a85e5e5643 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 5 Mar 2014 11:52:24 +0100 +Subject: ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs + +From: Takashi Iwai + +commit c5eda4c1bf6214332c46fb2f4e7c42a85e5e5643 upstream. + +The mixer widget (NID 0x20) of AD1884 and AD1984 codecs isn't +connected directly to the actual I/O paths but only via another mixer +widget (NID 0x21). We need a similar fix as we did for AD1882. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_analog.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_analog.c ++++ b/sound/pci/hda/patch_analog.c +@@ -3667,6 +3667,7 @@ static int ad1884_parse_auto_config(stru + spec = codec->spec; + + spec->gen.mixer_nid = 0x20; ++ spec->gen.mixer_merge_nid = 0x21; + spec->gen.beep_nid = 0x10; + set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); + diff --git a/queue-3.10/alsa-hda-added-inverted-digital-mic-handling-for-acer-travelmate-8371.patch b/queue-3.10/alsa-hda-added-inverted-digital-mic-handling-for-acer-travelmate-8371.patch new file mode 100644 index 00000000000..01d9f175a9b --- /dev/null +++ b/queue-3.10/alsa-hda-added-inverted-digital-mic-handling-for-acer-travelmate-8371.patch @@ -0,0 +1,27 @@ +From a6b92b6650d010d58b6e6fe42c6271266e0b1134 Mon Sep 17 00:00:00 2001 +From: Marius Knaust +Date: Mon, 3 Mar 2014 01:48:58 +0100 +Subject: ALSA: hda - Added inverted digital-mic handling for Acer TravelMate 8371 + +From: Marius Knaust + +commit a6b92b6650d010d58b6e6fe42c6271266e0b1134 upstream. + +Signed-off-by: Marius Knaust +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 +@@ -3648,6 +3648,7 @@ static const struct hda_fixup alc269_fix + }; + + static const struct snd_pci_quirk alc269_fixup_tbl[] = { ++ SND_PCI_QUIRK(0x1025, 0x0283, "Acer TravelMate 8371", ALC269_FIXUP_INV_DMIC), + SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC), + SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC), + SND_PCI_QUIRK(0x1028, 0x05bd, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), diff --git a/queue-3.10/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch b/queue-3.10/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch new file mode 100644 index 00000000000..0c93e6bf51a --- /dev/null +++ b/queue-3.10/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch @@ -0,0 +1,32 @@ +From 3dd77654fb1d7f68b9739f3039bad8dbbc0739f8 Mon Sep 17 00:00:00 2001 +From: Roman Volkov +Date: Fri, 24 Jan 2014 16:18:14 +0400 +Subject: ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2 + +From: Roman Volkov + +commit 3dd77654fb1d7f68b9739f3039bad8dbbc0739f8 upstream. + +Actually CS4245 connected to the I2S channel 1 for +capture, not channel 2. Otherwise capturing and +playback does not work for CS4245. + +Signed-off-by: Roman Volkov +Signed-off-by: Clemens Ladisch +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/oxygen/xonar_dg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/oxygen/xonar_dg.c ++++ b/sound/pci/oxygen/xonar_dg.c +@@ -596,7 +596,7 @@ struct oxygen_model model_xonar_dg = { + .model_data_size = sizeof(struct dg), + .device_config = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | +- CAPTURE_0_FROM_I2S_2 | ++ CAPTURE_0_FROM_I2S_1 | + CAPTURE_1_FROM_SPDIF, + .dac_channels_pcm = 6, + .dac_channels_mixer = 0, diff --git a/queue-3.10/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch b/queue-3.10/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch new file mode 100644 index 00000000000..36032d99672 --- /dev/null +++ b/queue-3.10/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch @@ -0,0 +1,29 @@ +From e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 5 Mar 2014 12:34:39 +0100 +Subject: ALSA: usb-audio: Add quirk for Logitech Webcam C500 + +From: Takashi Iwai + +commit e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25 upstream. + +Logitech C500 (046d:0807) needs the same workaround like other +Logitech Webcams. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/mixer.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/mixer.c ++++ b/sound/usb/mixer.c +@@ -883,6 +883,7 @@ static void volume_control_quirks(struct + } + break; + ++ case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */ + case USB_ID(0x046d, 0x0808): + case USB_ID(0x046d, 0x0809): + case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ diff --git a/queue-3.10/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch b/queue-3.10/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch new file mode 100644 index 00000000000..42ffabe6a6a --- /dev/null +++ b/queue-3.10/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch @@ -0,0 +1,32 @@ +From a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 Mon Sep 17 00:00:00 2001 +From: Anton Blanchard +Date: Tue, 4 Mar 2014 08:31:24 +1100 +Subject: powerpc: Align p_dyn, p_rela and p_st symbols + +From: Anton Blanchard + +commit a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 upstream. + +The 64bit relocation code places a few symbols in the text segment. +These symbols are only 4 byte aligned where they need to be 8 byte +aligned. Add an explicit alignment. + +Signed-off-by: Anton Blanchard +Tested-by: Laurent Dufour +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/kernel/reloc_64.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/kernel/reloc_64.S ++++ b/arch/powerpc/kernel/reloc_64.S +@@ -81,6 +81,7 @@ _GLOBAL(relocate) + + 6: blr + ++.balign 8 + p_dyn: .llong __dynamic_start - 0b + p_rela: .llong __rela_dyn_start - 0b + p_st: .llong _stext - 0b diff --git a/queue-3.10/series b/queue-3.10/series index 7b775de90b2..afd3b72ee6a 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -27,3 +27,8 @@ mwifiex-copy-ap-s-ht-capability-info-correctly.patch mwifiex-save-and-copy-ap-s-vht-capability-info-correctly.patch arm-7811-1-locks-use-early-clobber-in-arch_spin_trylock.patch drm-ttm-don-t-oops-if-no-invalidate_caches.patch +alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch +alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch +alsa-hda-added-inverted-digital-mic-handling-for-acer-travelmate-8371.patch +alsa-hda-add-missing-loopback-merge-path-for-ad1884-1984-codecs.patch +powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch