diff options
Diffstat (limited to 'sound/soc/tegra/tegra20_i2s.c')
| -rw-r--r-- | sound/soc/tegra/tegra20_i2s.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index c8682302b4aa..9ebe36795b07 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -249,9 +249,14 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream, tegra20_i2s_write(i2s, TEGRA20_I2S_TIMING, reg); - tegra20_i2s_write(i2s, TEGRA20_I2S_FIFO_SCR, - TEGRA20_I2S_FIFO_SCR_FIFO2_ATN_LVL_FOUR_SLOTS | - TEGRA20_I2S_FIFO_SCR_FIFO1_ATN_LVL_FOUR_SLOTS); + if (sample_size * params_channels(params) >= 32) + tegra20_i2s_write(i2s, TEGRA20_I2S_FIFO_SCR, + TEGRA20_I2S_FIFO_SCR_FIFO2_ATN_LVL_FOUR_SLOTS | + TEGRA20_I2S_FIFO_SCR_FIFO1_ATN_LVL_FOUR_SLOTS); + else + tegra20_i2s_write(i2s, TEGRA20_I2S_FIFO_SCR, + TEGRA20_I2S_FIFO_SCR_FIFO2_ATN_LVL_EIGHT_SLOTS | + TEGRA20_I2S_FIFO_SCR_FIFO1_ATN_LVL_EIGHT_SLOTS); i2s->reg_ctrl &= ~TEGRA20_I2S_CTRL_FIFO_FORMAT_MASK; reg = tegra20_i2s_read(i2s, TEGRA20_I2S_PCM_CTRL); @@ -263,12 +268,17 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream, else i2s->reg_ctrl |= TEGRA20_I2S_CTRL_FIFO_FORMAT_32; + i2s->capture_dma_data.width = sample_size; + i2s->playback_dma_data.width = sample_size; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) reg |= TEGRA20_I2S_PCM_CTRL_TRM_MODE_EN; else reg |= TEGRA20_I2S_PCM_CTRL_RCV_MODE_EN; } else { i2s->reg_ctrl |= TEGRA20_I2S_CTRL_FIFO_FORMAT_PACKED; + i2s->capture_dma_data.width = 32; + i2s->playback_dma_data.width = 32; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) reg &= ~TEGRA20_I2S_PCM_CTRL_TRM_MODE_EN; else |