aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-07-07 09:22:07 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-07-09 16:29:18 +0200
commit20402106a376dcc4a766d3b0cee801ce29ba76d5 (patch)
treecfd93c19a6766663c4e8537ca8b8b82ad50478ee /target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch
parentf1765277bacbea47a45ed913ca8fa043e9f71393 (diff)
downloadupstream-20402106a376dcc4a766d3b0cee801ce29ba76d5.tar.gz
upstream-20402106a376dcc4a766d3b0cee801ce29ba76d5.tar.bz2
upstream-20402106a376dcc4a766d3b0cee801ce29ba76d5.zip
brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch b/target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch
new file mode 100644
index 0000000000..9f8d7d9603
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch
@@ -0,0 +1,31 @@
+From f8473a921ad7208ca5b4218571f3ffd267b18cff Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Fri, 29 Apr 2016 17:27:35 +0100
+Subject: [PATCH 310/423] Revert "bcm2835: add fallback channel layouts if
+ channel map API is not used"
+
+This reverts commit ceacfff9f86f89826dbc8a6df667f485894327d1.
+---
+ sound/arm/bcm2835-vchiq.c | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+--- a/sound/arm/bcm2835-vchiq.c
++++ b/sound/arm/bcm2835-vchiq.c
+@@ -598,16 +598,7 @@ int bcm2835_audio_set_params(bcm2835_als
+ if (alsa_stream->chip->cea_chmap >= 0) {
+ chmap_value = (unsigned)alsa_stream->chip->cea_chmap << 24;
+ } else {
+- /* fallback layouts for applications which do not use chmap API */
+- chmap_value = 0x00;
+- switch (channels) {
+- case 3: chmap_value = 0x01; break;
+- case 4: chmap_value = 0x03; break;
+- case 5: chmap_value = 0x07; break;
+- case 6: chmap_value = 0x0b; break;
+- case 7: chmap_value = 0x0f; break;
+- case 8: chmap_value = 0x13; break;
+- }
++ chmap_value = 0; /* force stereo */
+ for (i = 0; i < 8; i++)
+ alsa_stream->chip->map_channels[i] = i;
+ }