lkml.org 
[lkml]   [2012]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [ASoC] Fix: Revert 'ASoC: imx-ssi: Remove mono support'.
    From
    On 4 September 2012 08:35, Gaëtan Carlier <gcembed@gmail.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@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_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@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-09-04 11:42    [W:5.308 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site