From: Matt Flax <flatmax@flatmax.org>
Date: Wed, 8 Mar 2017 10:13:24 +0000 (+1100)
Subject: ASoC: bcm2835_i2s.c: relax the ch2 register setting for 8 channels
X-Git-Tag: Ubuntu-raspi2-4.10.0-1019.22~87
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-zesty-kernel.git;a=commitdiff_plain;h=e8f216894cf4d083cfdb0cc89e6f27f9929147f6

ASoC: bcm2835_i2s.c: relax the ch2 register setting for 8 channels

This patch allows ch2 registers to be set for 8 channels of audio.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index 6ba20498202e..c8dd065aea84 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -239,6 +239,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
 	unsigned int ch1pos, ch2pos, mode, format;
 	uint32_t csreg;
 
+
 	/*
 	 * If a stream is already enabled,
 	 * the registers are already set properly.
@@ -312,6 +313,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
 
 	switch (params_channels(params)) {
 	case 2:
+	case 8:
 		format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
 		format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
 		format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));