summaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-02 20:32:43 -0800
committerMark Brown <broonie@linaro.org>2014-03-05 14:10:47 +0800
commit81985bd63f6f1711035aa8d97caf2fb203250a95 (patch)
treee645f39edf0dba8862754b556c848778be554d63 /sound/soc/generic
parentf687d900d30a61dda38db2a99239f5284a86a309 (diff)
downloadop-kernel-dev-81985bd63f6f1711035aa8d97caf2fb203250a95.zip
op-kernel-dev-81985bd63f6f1711035aa8d97caf2fb203250a95.tar.gz
ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT
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>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r--sound/soc/generic/simple-card.c3
1 files changed, 3 insertions, 0 deletions
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;
}
/*
OpenPOWER on IntegriCloud