Skip to contentSkip to conversation

Patch "ASoC: db1200: Fix DAI link format for db1300 and db1550" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

    ASoC: db1200: Fix DAI link format for db1300 and db1550

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     asoc-db1200-fix-dai-link-format-for-db1300-and-db1550.patch

and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e74679b38c9417c1c524081121cdcdb36f82264d Mon Sep 17 00:00:00 2001

From: Lars-Peter Clausen <[email protected]>
Date: Fri, 25 Sep 2015 11:07:04 +0200
Subject: ASoC: db1200: Fix DAI link format for db1300 and db1550

From: Lars-Peter Clausen <[email protected]>

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")
---
 sound/soc/au1x/db1200.c |    4 ++++
 1 file changed, 4 insertions(+)
sound/soc/au1x/db1200.c +4 -0
@@ -129,6 +129,8 @@ static struct snd_soc_dai_link db1300_i2
 	.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_i2
 	.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,
 };
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/asoc-db1200-fix-dai-link-format-for-db1300-and-db1550.patch