diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-05-12 04:03:51 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-05-22 15:13:09 +0200 |
commit | b723550d7e84b6b59d427d560be49d8ab177ea89 (patch) | |
tree | 7295e69bb1bc9b305d6bd517c99752955e2705fc | |
parent | Merge branch 'topic/dpcm' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
download | linux-b723550d7e84b6b59d427d560be49d8ab177ea89.tar.xz linux-b723550d7e84b6b59d427d560be49d8ab177ea89.zip |
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>
-rw-r--r-- | sound/soc/sh/rcar/rsrc-card.c | 1 |
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 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); |