target/linux/brcm2708/patches-4.4/0313-Revert-bcm2835-only-allow-stereo-if-analogue-jack-is.patch

   1 From a6aaa7b9b060fcb361dd4d52255cb80d6e43fa5a Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Fri, 29 Apr 2016 17:28:06 +0100
   4 Subject: [PATCH] Revert "bcm2835: only allow stereo if analogue jack is
   5  selected"
   6
   7 This reverts commit 5f7049894f47b3836838cd68e29ee883179c80b3.
   8 ---
   9  sound/arm/bcm2835-ctl.c | 12 ------------
  10  1 file changed, 12 deletions(-)
  11
  12 --- a/sound/arm/bcm2835-ctl.c
  13 +++ b/sound/arm/bcm2835-ctl.c
  14 @@ -423,16 +423,9 @@ static struct cea_channel_speaker_alloca
  15  { .ca_index = 0x31,  .speakers = { FRW,  FLW,  RR,  RL,  FC,  LFE,  FR,  FL } },
  16  };
  17
  18 -static int uses_analogue(bcm2835_chip_t *chip)
  19 -{
  20 -       return chip->dest == 1;
  21 -}
  22 -
  23  static int snd_bcm2835_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
  24                                      unsigned int size, unsigned int __user *tlv)
  25  {
  26 -       struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
  27 -       bcm2835_chip_t *chip = info->private_data;
  28         unsigned int __user *dst;
  29         int count = 0;
  30         int i;
  31 @@ -449,9 +442,6 @@ static int snd_bcm2835_chmap_ctl_tlv(str
  32                 int chs_bytes;
  33                 int c;
  34
  35 -               if (i > 0 && uses_analogue(chip))
  36 -                       break;
  37 -
  38                 for (c = 0; c < 8; c++) {
  39                         if (ch->speakers[c])
  40                                 num_chs++;
  41 @@ -562,8 +552,6 @@ static int snd_bcm2835_chmap_ctl_put(str
  42                 int matches = 1;
  43                 int cur = 0;
  44                 int x;
  45 -               if (i > 0 && uses_analogue(chip))
  46 -                       break;
  47                 memset(remap, 0, sizeof(remap));
  48                 for (x = 0; x < substream->runtime->channels; x++) {
  49                         int sp = ucontrol->value.integer.value[x];