Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress', 'asoc/fix/fsl...
authorMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:55 +0000 (11:29 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:55 +0000 (11:29 +0000)
1  2  3  4  5  6  7  8  9 
sound/soc/rockchip/rockchip_i2s.c

@@@@@@@@@@ -335,6 -335,6 -335,6 -335,6 -335,6 -335,6 -335,6 -335,7 -335,6 +335,7 @@@@@@@@@@ static struct snd_soc_dai_driver rockch
                                    SNDRV_PCM_FMTBIT_S24_LE),
                },
                .ops = &rockchip_i2s_dai_ops,
+++++++ +       .symmetric_rates = 1,
         };
         
         static const struct snd_soc_component_driver rockchip_i2s_component = {
@@@@@@@@@@ -454,11 -454,11 -454,11 -454,11 -454,11 -454,11 -454,11 -455,11 -454,11 +455,11 @@@@@@@@@@ static int rockchip_i2s_probe(struct pl
         
                i2s->playback_dma_data.addr = res->start + I2S_TXDR;
                i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 --------       i2s->playback_dma_data.maxburst = 16;
 ++++++++       i2s->playback_dma_data.maxburst = 4;
         
                i2s->capture_dma_data.addr = res->start + I2S_RXDR;
                i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 --------       i2s->capture_dma_data.maxburst = 16;
 ++++++++       i2s->capture_dma_data.maxburst = 4;
         
                i2s->dev = &pdev->dev;
                dev_set_drvdata(&pdev->dev, i2s);