| Message ID | 55ED7AF2.1050800@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e74679b38c9417c1c524081121cdcdb36f82264d |
| Headers | show |
Servus, On Mon, Sep 7, 2015 at 1:54 PM, Lars-Peter Clausen <lars@metafoo.de> wrote: > On 09/06/2015 07:32 PM, Manuel Lauss wrote: >> Hi Lars, >> >> commit b4508d0f95fa4aaed889549e31391641d675d4bb >> ("ASoC: db1200: Use static DAI format setup") breaks I2S in that the >> set_dai_fmt() callbacks of neither the codec (wm8731) nor the I2S block >> (psc-i2s) are called. >> >> Please revert this change or fix it up so that the set_dai_fmt() callbacks >> are at least called once. (This was broken since 4.0, but I just now got >> around to test linux on the hardware again). > > Hi, > > Can you check whether the attached patch fixes it? Ja das funktioniert wieder auf dem DB1300. Danke dir! Manuel
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index 58c3164..8c907eb 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -129,6 +129,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, }; @@ -146,6 +148,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, };