ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT
diff mbox

Message ID 874n3fyk9k.wl%kuninori.morimoto.gx@gmail.com
State Accepted
Commit 81985bd63f6f1711035aa8d97caf2fb203250a95
Delegated to: Mark Brown
Headers show

Commit Message

Kuninori Morimoto March 3, 2014, 4:32 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

30d0341e7da0c012f64fb290dd1153360fb49a8d
(ASoC: simple-card: simplify the daifmt code)
simplify cpu/codec dai_fmt which consists from
dai specific format + common format.
But, it didn't care about non-DT case.
This patch fixes it

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/generic/simple-card.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

Mark Brown March 5, 2014, 6:11 a.m. UTC | #1
On Sun, Mar 02, 2014 at 08:32:43PM -0800, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> 30d0341e7da0c012f64fb290dd1153360fb49a8d
> (ASoC: simple-card: simplify the daifmt code)
> simplify cpu/codec dai_fmt which consists from

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 034a2b7..7cabcc5 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -307,6 +307,9 @@  static int asoc_simple_card_probe(struct platform_device *pdev)
 						sizeof(priv->cpu_dai));
 		memcpy(&priv->codec_dai, &cinfo->codec_dai,
 						sizeof(priv->codec_dai));
+
+		priv->cpu_dai.fmt	|= cinfo->daifmt;
+		priv->codec_dai.fmt	|= cinfo->daifmt;
 	}
 
 	/*