diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-03-21 03:06:05 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-21 03:06:05 -0400 |
commit | 6681bc0deba495fad0d6fb349e40524abd1b1732 (patch) | |
tree | f6acb7cedb924fd14230dc3273acb26eac393676 /sound/soc/samsung | |
parent | ca3e9297e29c48eebb010d0225ea580fbcc64c88 (diff) | |
parent | 22f8d055350066b4a87de4adea8c5213cac54534 (diff) |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
Last minute ASoC updates for 3.4
There's a couple of small features here that were added late on but have
been in -next in my tree and some bug fixes. The wm_hubs stuff is
actually bug fixes - the stuff that's currently in 3.4 is a half way
house between the two solutions that the latest change allows the
machine to select between.
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/i2s.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 6553b19c70c7..6ac7b8281a02 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -559,6 +559,17 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, | |||
559 | mod |= MOD_DC1_EN; | 559 | mod |= MOD_DC1_EN; |
560 | break; | 560 | break; |
561 | case 2: | 561 | case 2: |
562 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
563 | i2s->dma_playback.dma_size = 4; | ||
564 | else | ||
565 | i2s->dma_capture.dma_size = 4; | ||
566 | break; | ||
567 | case 1: | ||
568 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
569 | i2s->dma_playback.dma_size = 2; | ||
570 | else | ||
571 | i2s->dma_capture.dma_size = 2; | ||
572 | |||
562 | break; | 573 | break; |
563 | default: | 574 | default: |
564 | dev_err(&i2s->pdev->dev, "%d channels not supported\n", | 575 | dev_err(&i2s->pdev->dev, "%d channels not supported\n", |
@@ -963,7 +974,7 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) | |||
963 | i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS; | 974 | i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS; |
964 | 975 | ||
965 | if (!sec) { | 976 | if (!sec) { |
966 | i2s->i2s_dai_drv.capture.channels_min = 2; | 977 | i2s->i2s_dai_drv.capture.channels_min = 1; |
967 | i2s->i2s_dai_drv.capture.channels_max = 2; | 978 | i2s->i2s_dai_drv.capture.channels_max = 2; |
968 | i2s->i2s_dai_drv.capture.rates = SAMSUNG_I2S_RATES; | 979 | i2s->i2s_dai_drv.capture.rates = SAMSUNG_I2S_RATES; |
969 | i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS; | 980 | i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS; |