diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-09-05 20:30:10 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 20:44:21 -0400 |
| commit | 104c229932f18605acef2351373f8fd8f6c6f8c6 (patch) | |
| tree | 8a07e8d340c46b7447cf446b914180a4526e75e9 /sound/soc/fsl | |
| parent | e2d32ff6ce4ee9958f3973a086f3fa5d009e6306 (diff) | |
ASoC: Revert 'ASoC: imx-ssi: Remove mono support'
Revert 0865a75(ASoC: imx-ssi: Remove mono support).
The bug this patch is meant to solve doesn't occur in Visstrim_M10 boards.
Furthermore, after applying this patch sound in Visstrim_M10 is played
at slower rates.
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 7074ae689984..3c520c46fa4a 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
| @@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai) | |||
| 380 | static struct snd_soc_dai_driver imx_ssi_dai = { | 380 | static struct snd_soc_dai_driver imx_ssi_dai = { |
| 381 | .probe = imx_ssi_dai_probe, | 381 | .probe = imx_ssi_dai_probe, |
| 382 | .playback = { | 382 | .playback = { |
| 383 | /* The SSI does not support monaural audio. */ | 383 | .channels_min = 1, |
| 384 | .channels_min = 2, | ||
| 385 | .channels_max = 2, | 384 | .channels_max = 2, |
| 386 | .rates = SNDRV_PCM_RATE_8000_96000, | 385 | .rates = SNDRV_PCM_RATE_8000_96000, |
| 387 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 386 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 388 | }, | 387 | }, |
| 389 | .capture = { | 388 | .capture = { |
| 390 | .channels_min = 2, | 389 | .channels_min = 1, |
| 391 | .channels_max = 2, | 390 | .channels_max = 2, |
| 392 | .rates = SNDRV_PCM_RATE_8000_96000, | 391 | .rates = SNDRV_PCM_RATE_8000_96000, |
| 393 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 392 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |