]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ASoC: bcm2835_i2s.c: relax the ch2 register setting for 8 channels
authorMatt Flax <flatmax@flatmax.org>
Wed, 8 Mar 2017 10:13:24 +0000 (21:13 +1100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 19 Sep 2017 10:07:54 +0000 (12:07 +0200)
This patch allows ch2 registers to be set for 8 channels of audio.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
sound/soc/bcm/bcm2835-i2s.c

index 6ba20498202ed36906b52096893a88867a79269f..c8dd065aea8414b47aa2ea4fc04168b5e29002ad 100644 (file)
@@ -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));