lkml.org 
[lkml]   [2015]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 041/155] ASoC: db1200: Fix DAI link format for db1300 and db1550
    Date
    3.19.8-ckt10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lars-Peter Clausen <lars@metafoo.de>

    commit e74679b38c9417c1c524081121cdcdb36f82264d upstream.

    Commit b4508d0f95fa ("ASoC: db1200: Use static DAI format setup") switched
    the db1200 driver over to using static DAI format setup instead of a
    callback function. But the commit only added the dai_fmt field to one of
    the three DAI links in the driver. This breaks audio on db1300 and db1550.

    Add the two missing dai_fmt settings to fix the issue.

    Fixes: b4508d0f95fa ("ASoC: db1200: Use static DAI format setup")
    Reported-by: Manuel Lauss <manuel.lauss@gmail.com>
    Tested-by: Manuel Lauss <manuel.lauss@gmail.com>
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/soc/au1x/db1200.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
    index a747ac0..d9d95b5 100644
    --- a/sound/soc/au1x/db1200.c
    +++ b/sound/soc/au1x/db1200.c
    @@ -142,6 +142,8 @@ static struct snd_soc_dai_link db1300_i2s_dai = {
    .cpu_dai_name = "au1xpsc_i2s.2",
    .platform_name = "au1xpsc-pcm.2",
    .codec_name = "wm8731.0-001b",
    + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
    + SND_SOC_DAIFMT_CBM_CFM,
    .ops = &db1200_i2s_wm8731_ops,
    };

    @@ -159,6 +161,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = {
    .cpu_dai_name = "au1xpsc_i2s.3",
    .platform_name = "au1xpsc-pcm.3",
    .codec_name = "wm8731.0-001b",
    + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
    + SND_SOC_DAIFMT_CBM_CFM,
    .ops = &db1200_i2s_wm8731_ops,
    };

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-13 01:21    [W:4.373 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site