target/linux/brcm2708/patches-4.4/0310-Revert-bcm2835-add-fallback-channel-layouts-if-chann.patch

   1 From fc43a2bf668e325aab427a8c0827cfc3b8a1e39f Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Fri, 29 Apr 2016 17:27:35 +0100
   4 Subject: [PATCH] Revert "bcm2835: add fallback channel layouts if channel map
   5  API is not used"
   6
   7 This reverts commit ceacfff9f86f89826dbc8a6df667f485894327d1.
   8 ---
   9  sound/arm/bcm2835-vchiq.c | 11 +----------
  10  1 file changed, 1 insertion(+), 10 deletions(-)
  11
  12 --- a/sound/arm/bcm2835-vchiq.c
  13 +++ b/sound/arm/bcm2835-vchiq.c
  14 @@ -598,16 +598,7 @@ int bcm2835_audio_set_params(bcm2835_als
  15         if (alsa_stream->chip->cea_chmap >= 0) {
  16                 chmap_value = (unsigned)alsa_stream->chip->cea_chmap << 24;
  17         } else {
  18 -               /* fallback layouts for applications which do not use chmap API */
  19 -               chmap_value = 0x00;
  20 -               switch (channels) {
  21 -               case 3: chmap_value = 0x01; break;
  22 -               case 4: chmap_value = 0x03; break;
  23 -               case 5: chmap_value = 0x07; break;
  24 -               case 6: chmap_value = 0x0b; break;
  25 -               case 7: chmap_value = 0x0f; break;
  26 -               case 8: chmap_value = 0x13; break;
  27 -               }
  28 +               chmap_value = 0; /* force stereo */
  29                 for (i = 0; i < 8; i++)
  30                         alsa_stream->chip->map_channels[i] = i;
  31         }