diff options
Diffstat (limited to 'sound/soc/davinci/davinci-mcasp.c')
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 3c5a9804d3f5..56ec1d301ac2 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
@@ -629,7 +629,7 @@ static int davinci_mcasp_ch_constraint(struct davinci_mcasp *mcasp, int stream, | |||
629 | if (mcasp->tdm_mask[stream]) | 629 | if (mcasp->tdm_mask[stream]) |
630 | slots = hweight32(mcasp->tdm_mask[stream]); | 630 | slots = hweight32(mcasp->tdm_mask[stream]); |
631 | 631 | ||
632 | for (i = 2; i <= slots; i++) | 632 | for (i = 1; i <= slots; i++) |
633 | list[count++] = i; | 633 | list[count++] = i; |
634 | 634 | ||
635 | for (i = 2; i <= serializers; i++) | 635 | for (i = 2; i <= serializers; i++) |
@@ -1297,7 +1297,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, | |||
1297 | 1297 | ||
1298 | snd_pcm_hw_constraint_minmax(substream->runtime, | 1298 | snd_pcm_hw_constraint_minmax(substream->runtime, |
1299 | SNDRV_PCM_HW_PARAM_CHANNELS, | 1299 | SNDRV_PCM_HW_PARAM_CHANNELS, |
1300 | 2, max_channels); | 1300 | 0, max_channels); |
1301 | 1301 | ||
1302 | snd_pcm_hw_constraint_list(substream->runtime, | 1302 | snd_pcm_hw_constraint_list(substream->runtime, |
1303 | 0, SNDRV_PCM_HW_PARAM_CHANNELS, | 1303 | 0, SNDRV_PCM_HW_PARAM_CHANNELS, |
@@ -1459,13 +1459,13 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { | |||
1459 | .suspend = davinci_mcasp_suspend, | 1459 | .suspend = davinci_mcasp_suspend, |
1460 | .resume = davinci_mcasp_resume, | 1460 | .resume = davinci_mcasp_resume, |
1461 | .playback = { | 1461 | .playback = { |
1462 | .channels_min = 2, | 1462 | .channels_min = 1, |
1463 | .channels_max = 32 * 16, | 1463 | .channels_max = 32 * 16, |
1464 | .rates = DAVINCI_MCASP_RATES, | 1464 | .rates = DAVINCI_MCASP_RATES, |
1465 | .formats = DAVINCI_MCASP_PCM_FMTS, | 1465 | .formats = DAVINCI_MCASP_PCM_FMTS, |
1466 | }, | 1466 | }, |
1467 | .capture = { | 1467 | .capture = { |
1468 | .channels_min = 2, | 1468 | .channels_min = 1, |
1469 | .channels_max = 32 * 16, | 1469 | .channels_max = 32 * 16, |
1470 | .rates = DAVINCI_MCASP_RATES, | 1470 | .rates = DAVINCI_MCASP_RATES, |
1471 | .formats = DAVINCI_MCASP_PCM_FMTS, | 1471 | .formats = DAVINCI_MCASP_PCM_FMTS, |
@@ -1971,12 +1971,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) | |||
1971 | */ | 1971 | */ |
1972 | mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list = | 1972 | mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list = |
1973 | devm_kzalloc(mcasp->dev, sizeof(unsigned int) * | 1973 | devm_kzalloc(mcasp->dev, sizeof(unsigned int) * |
1974 | (32 + mcasp->num_serializer - 2), | 1974 | (32 + mcasp->num_serializer - 1), |
1975 | GFP_KERNEL); | 1975 | GFP_KERNEL); |
1976 | 1976 | ||
1977 | mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list = | 1977 | mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list = |
1978 | devm_kzalloc(mcasp->dev, sizeof(unsigned int) * | 1978 | devm_kzalloc(mcasp->dev, sizeof(unsigned int) * |
1979 | (32 + mcasp->num_serializer - 2), | 1979 | (32 + mcasp->num_serializer - 1), |
1980 | GFP_KERNEL); | 1980 | GFP_KERNEL); |
1981 | 1981 | ||
1982 | if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list || | 1982 | if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list || |