Hi Javier, On 09/03/2012 10:27 AM, Javier Martin wrote:
The following commit should be reverted: 0865a75d4166bddc533fd50831829ceefb94f9b0
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
diff --git b/sound/soc/fsl/imx-ssi.c a/sound/soc/fsl/imx-ssi.c index ac337ac..28dd76c 100644 --- b/sound/soc/fsl/imx-ssi.c +++ a/sound/soc/fsl/imx-ssi.c @@ -380,13 +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 = {
.channels_min = 2,
.channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = {.channels_min = 1,
.channels_min = 2,
.channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE,.channels_min = 1,
When applied on linux-next-20120824, the patch failed because original imx-ssi.c file looks like : 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_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = { .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .ops = &imx_ssi_pcm_dai_ops, };
The comment line is missing in your patch. Here is the right patch :
@@ -378,18 +378,17 @@ 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, }, .ops = &imx_ssi_pcm_dai_ops,
Regards, Gaëtan Carlier.