summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-05-12 02:03:51 +0000
committerMark Brown <broonie@kernel.org>2015-05-22 14:13:09 +0100
commitb723550d7e84b6b59d427d560be49d8ab177ea89 (patch)
tree7295e69bb1bc9b305d6bd517c99752955e2705fc /sound/soc/sh
parent96a5d3f017dbbb3947f701984f729249fc0f49a8 (diff)
downloadop-kernel-dev-b723550d7e84b6b59d427d560be49d8ab177ea89.zip
op-kernel-dev-b723550d7e84b6b59d427d560be49d8ab177ea89.tar.gz
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>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/rsrc-card.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index a68517a..050b0db 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);
OpenPOWER on IntegriCloud