summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/ctu.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-01-21 01:58:07 +0000
committerMark Brown <broonie@kernel.org>2016-01-22 17:12:25 +0000
commit5ba17b42e1755c3c5cfe96370cfd47f34d01f62c (patch)
tree32ad8ae98f2fbb622359c3cb0cebce2399cf6c97 /sound/soc/sh/rcar/ctu.c
parent72154e50728e8a08940332db20884b63dfa6590d (diff)
downloadop-kernel-dev-5ba17b42e1755c3c5cfe96370cfd47f34d01f62c.zip
op-kernel-dev-5ba17b42e1755c3c5cfe96370cfd47f34d01f62c.tar.gz
ASoC: rsnd: each mod has status again for CTU/MUX support
SSI will be used as normal SSI or as clock parent SSI. Therefor, rsnd driver wants to control SSI and parent SSI separately. Otherwise it can't use Playback/Capture in the same time. And it has been done by c2dc47d5cf("ASoC: rsnd: rsnd_dai_stream has each mod's status insted of rsnd_mod") before. OTOH, rsnd driver doesn't want to control CTU/MUX/DVC/SSIU/SSI in separately. Otherwise, these will be re-initialized during playing if MUX merges 2 sounds. Because of these picky reasons, this patch re-defines status on each mod, and add new parent_ssi_status on rsnd_dai_stream. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/ctu.c')
-rw-r--r--sound/soc/sh/rcar/ctu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index d53a225..109930a 100644
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -129,7 +129,7 @@ int rsnd_ctu_probe(struct rsnd_priv *priv)
}
ret = rsnd_mod_init(priv, rsnd_mod_get(ctu), &rsnd_ctu_ops,
- clk, RSND_MOD_CTU, i);
+ clk, rsnd_mod_get_status, RSND_MOD_CTU, i);
if (ret)
goto rsnd_ctu_probe_done;
OpenPOWER on IntegriCloud