summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorJavier Martin <javier.martin@vista-silicon.com>2012-09-05 21:30:10 -0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-06 08:44:21 +0800
commit104c229932f18605acef2351373f8fd8f6c6f8c6 (patch)
tree8a07e8d340c46b7447cf446b914180a4526e75e9 /sound/soc/fsl
parente2d32ff6ce4ee9958f3973a086f3fa5d009e6306 (diff)
downloadlinux-3.10-104c229932f18605acef2351373f8fd8f6c6f8c6.tar.gz
linux-3.10-104c229932f18605acef2351373f8fd8f6c6f8c6.tar.bz2
linux-3.10-104c229932f18605acef2351373f8fd8f6c6f8c6.zip
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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 7074ae68998..3c520c46fa4 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)
static struct snd_soc_dai_driver imx_ssi_dai = {
.probe = imx_ssi_dai_probe,
.playback = {
- /* The SSI does not support monaural audio. */
- .channels_min = 2,
+ .channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.capture = {
- .channels_min = 2,
+ .channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,