ASoC: rsnd: run rsnd_path_init() when probe() timing

Current rsnd SSIU/SSI/SCU/SRU path is set
when playback/capture starts up.
But it is meaningless method, since the path is based
on platform and can be set in probe() timing.
This patch sets the path on probe() timing.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

3 files changed, 78 insertions, 81 deletions

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index f0745af316be..96cb78612a7d 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -317,9 +317,9 @@ void  rsnd_dma_quit(struct rsnd_priv *priv,
         ret;                                                    \
 })
 
-int rsnd_dai_connect(struct rsnd_dai *rdai,
-                     struct rsnd_mod *mod,
-                     struct rsnd_dai_stream *io)
+static int rsnd_dai_connect(struct rsnd_dai *rdai,
+                            struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io)
 {
         if (!mod)
                 return -EIO;
@@ -340,7 +340,7 @@ int rsnd_dai_connect(struct rsnd_dai *rdai,
         return 0;
 }
 
-int rsnd_dai_disconnect(struct rsnd_mod *mod)
+static int rsnd_dai_disconnect(struct rsnd_mod *mod)
 {
         list_del_init(&mod->list);
         mod->io = NULL;
@@ -418,10 +418,6 @@ static int rsnd_dai_stream_init(struct rsnd_dai_stream *io,
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        if (!list_empty(&io->head))
-                return -EIO;
-
-        INIT_LIST_HEAD(&io->head);
         io->substream           = substream;
         io->byte_pos            = 0;
         io->period_pos          = 0;
@@ -476,10 +472,6 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_gen_path_init(priv, rdai, io);
-                if (ret < 0)
-                        goto dai_trigger_end;
-
                 ret = rsnd_dai_call(rdai, io, init);
                 if (ret < 0)
                         goto dai_trigger_end;
@@ -497,10 +489,6 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_gen_path_exit(priv, rdai, io);
-                if (ret < 0)
-                        goto dai_trigger_end;
-
                 ret = rsnd_platform_call(priv, dai, stop, ssi_id);
                 if (ret < 0)
                         goto dai_trigger_end;
@@ -576,6 +564,70 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
         .set_fmt        = rsnd_soc_dai_set_fmt,
 };
 
+static int rsnd_path_init(struct rsnd_priv *priv,
+                          struct rsnd_dai *rdai,
+                          struct rsnd_dai_stream *io)
+{
+        struct rsnd_mod *mod;
+        int ret;
+        int id;
+
+        /*
+         * Gen1 is created by SRU/SSI, and this SRU is base module of
+         * Gen2's SCU/SSIU/SSI. (Gen2 SCU/SSIU came from SRU)
+         *
+         * Easy image is..
+         *      Gen1 SRU = Gen2 SCU + SSIU + etc
+         *
+         * Gen2 SCU path is very flexible, but, Gen1 SRU (SCU parts) is
+         * using fixed path.
+         *
+         * Then, SSI id = SCU id here
+         */
+        /* get SSI's ID */
+        mod = rsnd_ssi_mod_get_frm_dai(priv,
+                                       rsnd_dai_id(priv, rdai),
+                                       rsnd_dai_is_play(rdai, io));
+        if (!mod)
+                return 0;
+        id = rsnd_mod_id(mod);
+        ret = 0;
+
+        /* SCU */
+        mod = rsnd_scu_mod_get(priv, id);
+        if (mod) {
+                ret = rsnd_dai_connect(rdai, mod, io);
+                if (ret < 0)
+                        return ret;
+        }
+
+        /* SSI */
+        mod = rsnd_ssi_mod_get(priv, id);
+        if (mod) {
+                ret = rsnd_dai_connect(rdai, mod, io);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return ret;
+}
+
+static int rsnd_path_exit(struct rsnd_priv *priv,
+                          struct rsnd_dai *rdai,
+                          struct rsnd_dai_stream *io)
+{
+        struct rsnd_mod *mod, *n;
+        int ret = 0;
+
+        /*
+         * remove all mod from rdai
+         */
+        for_each_rsnd_mod(mod, n, io)
+                ret |= rsnd_dai_disconnect(mod);
+
+        return ret;
+}
+
 static int rsnd_dai_probe(struct platform_device *pdev,
                           struct rsnd_priv *priv)
 {
@@ -634,12 +686,14 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                         drv[i].playback.formats         = RSND_FMTS;
                         drv[i].playback.channels_min    = 2;
                         drv[i].playback.channels_max    = 2;
+                        rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
                 }
                 if (cmod) {
                         drv[i].capture.rates            = RSND_RATES;
                         drv[i].capture.formats          = RSND_FMTS;
                         drv[i].capture.channels_min     = 2;
                         drv[i].capture.channels_max     = 2;
+                        rsnd_path_init(priv, &rdai[i], &rdai[i].capture);
                 }
 
                 dev_dbg(dev, "%s (%s/%s)\n", rdai[i].name,
@@ -653,6 +707,14 @@ static int rsnd_dai_probe(struct platform_device *pdev,
 static void rsnd_dai_remove(struct platform_device *pdev,
                           struct rsnd_priv *priv)
 {
+        struct rsnd_dai *rdai;
+        int i;
+
+        for (i = 0; i < rsnd_rdai_nr(priv); i++) {
+                rdai = rsnd_dai_get(priv, i);
+                rsnd_path_exit(priv, rdai, &rdai->playback);
+                rsnd_path_exit(priv, rdai, &rdai->capture);
+        }
 }
 
 /*
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index bcb98f4be831..4f2c1d0c6970 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -155,62 +155,6 @@ static int rsnd_gen_regmap_init(struct rsnd_priv *priv,
         return 0;
 }
 
-int rsnd_gen_path_init(struct rsnd_priv *priv,
-                       struct rsnd_dai *rdai,
-                       struct rsnd_dai_stream *io)
-{
-        struct rsnd_mod *mod;
-        int ret;
-        int id;
-
-        /*
-         * Gen1 is created by SRU/SSI, and this SRU is base module of
-         * Gen2's SCU/SSIU/SSI. (Gen2 SCU/SSIU came from SRU)
-         *
-         * Easy image is..
-         *      Gen1 SRU = Gen2 SCU + SSIU + etc
-         *
-         * Gen2 SCU path is very flexible, but, Gen1 SRU (SCU parts) is
-         * using fixed path.
-         *
-         * Then, SSI id = SCU id here
-         */
-
-        /* get SSI's ID */
-        mod = rsnd_ssi_mod_get_frm_dai(priv,
-                                       rsnd_dai_id(priv, rdai),
-                                       rsnd_dai_is_play(rdai, io));
-        id = rsnd_mod_id(mod);
-
-        /* SCU */
-        mod = rsnd_scu_mod_get(priv, id);
-        ret = rsnd_dai_connect(rdai, mod, io);
-        if (ret < 0)
-                return ret;
-
-        /* SSI */
-        mod = rsnd_ssi_mod_get(priv, id);
-        ret = rsnd_dai_connect(rdai, mod, io);
-
-        return ret;
-}
-
-int rsnd_gen_path_exit(struct rsnd_priv *priv,
-                       struct rsnd_dai *rdai,
-                       struct rsnd_dai_stream *io)
-{
-        struct rsnd_mod *mod, *n;
-        int ret = 0;
-
-        /*
-         * remove all mod from rdai
-         */
-        for_each_rsnd_mod(mod, n, io)
-                ret |= rsnd_dai_disconnect(mod);
-
-        return ret;
-}
-
 /*
  *              Gen2
  */
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 3962a50977e5..6a25203e0f08 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -210,9 +210,6 @@ struct rsnd_dai {
              i++)
 
 struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id);
-int rsnd_dai_disconnect(struct rsnd_mod *mod);
-int rsnd_dai_connect(struct rsnd_dai *rdai, struct rsnd_mod *mod,
-                     struct rsnd_dai_stream *io);
 int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io);
 int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai);
 #define rsnd_dai_get_platform_info(rdai) ((rdai)->info)
@@ -229,12 +226,6 @@ int rsnd_gen_probe(struct platform_device *pdev,
                    struct rsnd_priv *priv);
 void rsnd_gen_remove(struct platform_device *pdev,
                      struct rsnd_priv *priv);
-int rsnd_gen_path_init(struct rsnd_priv *priv,
-                       struct rsnd_dai *rdai,
-                       struct rsnd_dai_stream *io);
-int rsnd_gen_path_exit(struct rsnd_priv *priv,
-                       struct rsnd_dai *rdai,
-                       struct rsnd_dai_stream *io);
 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
                                struct rsnd_mod *mod,
                                enum rsnd_reg reg);