Re: ASoC: please revert "ASoC: db1200: Use static DAI format setup"

[Lars-Peter Clausen <lars@metafoo.de>]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

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?

- Lars

[-- Attachment #2: au1x.patch --]
[-- Type: text/x-patch, Size: 761 bytes --]

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,
 };
 

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]