OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96a5d3f
)
ASoC: rsnd: rsrc-card uses FE/BE merged format when DPCM
author
Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com>
Tue, 12 May 2015 02:03:51 +0000
(
02:03
+0000)
committer
Mark Brown
<broonie@kernel.org>
Fri, 22 May 2015 13:13:09 +0000
(14:13 +0100)
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>
sound/soc/sh/rcar/rsrc-card.c
patch
|
blob
|
history
diff --git
a/sound/soc/sh/rcar/rsrc-card.c
b/sound/soc/sh/rcar/rsrc-card.c
index
a68517a
..
050b0db
100644
(file)
--- 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);