openwrtv3/target/linux/brcm2708/patches-4.4/0313-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch
Álvaro Fernández Rojas 3fc661a98c brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted from the raspberry pi repo:
https://github.com/raspberrypi/linux/tree/rpi-4.4.y
Also alphabetically order sound-soc kernel packages.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2016-06-08 21:23:21 +02:00

31 lines
1.1 KiB
Diff

From 24d1da89c980e9561a823c065ef37ca25e13a48c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 29 Apr 2016 17:27:35 +0100
Subject: [PATCH 313/381] 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;
}