Commit 72154e50 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: rsnd: select each SRC correctly for CMD data path

To select CMD data patch, it should use correct SRC from each stream
in MUX case. But current code is selecting SRC from fixed stream.
This patch solves this issue.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 654a12b8
...@@ -29,7 +29,6 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, ...@@ -29,7 +29,6 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
{ {
struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io); struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
struct rsnd_mod *mix = rsnd_io_to_mod_mix(io); struct rsnd_mod *mix = rsnd_io_to_mod_mix(io);
struct rsnd_mod *src = rsnd_io_to_mod_src(io);
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
u32 data; u32 data;
...@@ -38,6 +37,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, ...@@ -38,6 +37,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
if (mix) { if (mix) {
struct rsnd_dai *rdai; struct rsnd_dai *rdai;
struct rsnd_mod *src;
struct rsnd_dai_stream *tio; struct rsnd_dai_stream *tio;
int i; int i;
u32 path[] = { u32 path[] = {
...@@ -57,15 +57,19 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, ...@@ -57,15 +57,19 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
data = 0; data = 0;
for_each_rsnd_dai(rdai, priv, i) { for_each_rsnd_dai(rdai, priv, i) {
tio = &rdai->playback; tio = &rdai->playback;
src = rsnd_io_to_mod_src(tio);
if (mix == rsnd_io_to_mod_mix(tio)) if (mix == rsnd_io_to_mod_mix(tio))
data |= path[rsnd_mod_id(src)]; data |= path[rsnd_mod_id(src)];
tio = &rdai->capture; tio = &rdai->capture;
src = rsnd_io_to_mod_src(tio);
if (mix == rsnd_io_to_mod_mix(tio)) if (mix == rsnd_io_to_mod_mix(tio))
data |= path[rsnd_mod_id(src)]; data |= path[rsnd_mod_id(src)];
} }
} else { } else {
struct rsnd_mod *src = rsnd_io_to_mod_src(io);
u32 path[] = { u32 path[] = {
[0] = 0x30000, [0] = 0x30000,
[1] = 0x30001, [1] = 0x30001,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment