[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACKLOr1nobfaKRnVVuiODAfCUugCYJ2=pDvbz6wn1Yexy7qb6A@mail.gmail.com>
Date: Tue, 4 Sep 2012 11:09:20 +0200
From: javier Martin <javier.martin@...ta-silicon.com>
To: Gaëtan Carlier <gcembed@...il.com>
Cc: linux-kernel@...r.kernel.org, alsa-devel@...a-project.org,
broonie@...nsource.wolfsonmicro.com, fabio.estevam@...escale.com,
s.hauer@...gutronix.de
Subject: Re: [ASoC] Fix: Revert 'ASoC: imx-ssi: Remove mono support'.
On 4 September 2012 08:35, Gaëtan Carlier <gcembed@...il.com> wrote:
> 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@...ta-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_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,
>>
> 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.
Mark,
could you pick up the fixed patch sent by Gaëtan?
Regards.
--
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists