ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 3 Mar 2014 04:32:43 +0000 (20:32 -0800)
committerMark Brown <broonie@linaro.org>
Wed, 5 Mar 2014 06:10:47 +0000 (14:10 +0800)
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>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/generic/simple-card.c

index 034a2b73f6c14d6a70a6d59e65ca0be5166f2196..7cabcc5c8703fce97a04e501c701c9ab6228e743 100644 (file)
@@ -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;
        }
 
        /*