From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 12 May 2015 02:03:51 +0000 (+0000)
Subject: ASoC: rsnd: rsrc-card uses FE/BE merged format when DPCM
X-Git-Tag: firefly_0821_release~176^2~1082^2~79^2^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b723550d7e84b6b59d427d560be49d8ab177ea89;p=firefly-linux-kernel-4.4.55.git

ASoC: rsnd: rsrc-card uses FE/BE merged format when DPCM

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index a68517afe615..050b0dbcee65 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -232,6 +232,7 @@ rsrc_card_sub_parse_of(struct rsrc_card_priv *priv,
 	if (args_count) {
 		*args_count = args.args_count;
 		dai_link->dynamic = 1;
+		dai_link->dpcm_merged_format = 1;
 	} else {
 		dai_link->no_pcm = 1;
 		priv->codec_conf.of_node = (*p_node);