3.4-stable patches

added patches:
	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.4/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch b/queue-3.4/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch
new file mode 100644 (file)
index 0000000..114ade0
--- /dev/null
+++ b/queue-3.4/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 <v1ron@mail.ru>
+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 <v1ron@mail.ru>
+
+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 <v1ron@mail.ru>
+Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -597,7 +597,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.4/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch b/queue-3.4/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch
new file mode 100644 (file)
index 0000000..066e644
--- /dev/null
+++ b/queue-3.4/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 <tiwai@suse.de>
+Date: Wed, 5 Mar 2014 12:34:39 +0100
+Subject: ALSA: usb-audio: Add quirk for Logitech Webcam C500
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25 upstream.
+
+Logitech C500 (046d:0807) needs the same workaround like other
+Logitech Webcams.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/usb/mixer.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/mixer.c
++++ b/sound/usb/mixer.c
+@@ -819,6 +819,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.4/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch b/queue-3.4/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch
new file mode 100644 (file)
index 0000000..42ffabe
--- /dev/null
+++ b/queue-3.4/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 <anton@samba.org>
+Date: Tue, 4 Mar 2014 08:31:24 +1100
+Subject: powerpc: Align p_dyn, p_rela and p_st symbols
+
+From: Anton Blanchard <anton@samba.org>
+
+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 <anton@samba.org>
+Tested-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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.4/series b/queue-3.4/series
index 65ec9ba4952a5fd43395e08b24dd9808bde77cda..bb9d18352394ab164f43d2fcd034fd22969ff3bb 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -9,3 +9,6 @@ mac80211-fix-ap-powersave-tx-vs.-wakeup-race.patch
 ath9k-fix-etsi-compliance-for-ar9462-2.0.patch
 mwifiex-copy-ap-s-ht-capability-info-correctly.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
+powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch