summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/mix.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-10-26 08:43:21 +0000
committerMark Brown <broonie@kernel.org>2015-11-16 10:09:29 +0000
commit1b2ca0adf1a0cb3aa766259650eddd25b44486b7 (patch)
tree126068a8d976bdff8333fdfa772da6b8ca103663 /sound/soc/sh/rcar/mix.c
parent497debaa803e25fc0163fe4380335b8626acad44 (diff)
downloadlinux-1b2ca0adf1a0cb3aa766259650eddd25b44486b7.tar.gz
linux-1b2ca0adf1a0cb3aa766259650eddd25b44486b7.tar.bz2
linux-1b2ca0adf1a0cb3aa766259650eddd25b44486b7.zip
ASoC: rsnd: use mod base common method on CMD
Renesas sound needs many devices (SSI/SSIU/SRC/CTU/MIX/DVC/CMD/AudioDMAC/AudioDMACpp). SSI/SRC/CTU/MIX/DVC are implemented as module. SSI parent, SSIU are implemented as part of SSI CMD is implemented as part of CTU/MIX/DVC AudioDMAC/AudioDMACpp are implemented as part of SSI/SRC It is nice sense that these all devices are implemented as mod. This patch makes CMD mod base common method 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/mix.c')
-rw-r--r--sound/soc/sh/rcar/mix.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index 953dd0be9b60..bcbd821981a9 100644
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -54,6 +54,13 @@ static void rsnd_mix_volume_update(struct rsnd_dai_stream *io,
rsnd_mod_write(mod, MIX_MDBER, 1);
}
+static int rsnd_mix_probe_(struct rsnd_mod *mod,
+ struct rsnd_dai_stream *io,
+ struct rsnd_priv *priv)
+{
+ return rsnd_cmd_attach(io, rsnd_mod_id(mod));
+}
+
static int rsnd_mix_init(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
@@ -66,8 +73,6 @@ static int rsnd_mix_init(struct rsnd_mod *mod,
rsnd_mod_write(mod, MIX_ADINR, rsnd_get_adinr_chan(mod, io));
- rsnd_path_parse(priv, io);
-
/* volume step */
rsnd_mod_write(mod, MIX_MIXMR, 0);
rsnd_mod_write(mod, MIX_MVPDR, 0);
@@ -90,6 +95,7 @@ static int rsnd_mix_quit(struct rsnd_mod *mod,
static struct rsnd_mod_ops rsnd_mix_ops = {
.name = MIX_NAME,
+ .probe = rsnd_mix_probe_,
.init = rsnd_mix_init,
.quit = rsnd_mix_quit,
};