1 From 9d56f11061a9d2598dd0c7a20886e3d5f76fa7a0 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 316/381] Revert "bcm2835: only allow stereo if analogue jack
7 This reverts commit 5f7049894f47b3836838cd68e29ee883179c80b3.
9 sound/arm/bcm2835-ctl.c | 12 ------------
10 1 file changed, 12 deletions(-)
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 } },
18 -static int uses_analogue(bcm2835_chip_t *chip)
20 - return chip->dest == 1;
23 static int snd_bcm2835_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
24 unsigned int size, unsigned int __user *tlv)
26 - struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
27 - bcm2835_chip_t *chip = info->private_data;
28 unsigned int __user *dst;
31 @@ -449,9 +442,6 @@ static int snd_bcm2835_chmap_ctl_tlv(str
35 - if (i > 0 && uses_analogue(chip))
38 for (c = 0; c < 8; c++) {
41 @@ -562,8 +552,6 @@ static int snd_bcm2835_chmap_ctl_put(str
45 - if (i > 0 && uses_analogue(chip))
47 memset(remap, 0, sizeof(remap));
48 for (x = 0; x < substream->runtime->channels; x++) {
49 int sp = ucontrol->value.integer.value[x];