3 files changed, 28 insertions, 6 deletions

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index f8425d8b44d2..b35f5509cfe2 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -958,12 +958,23 @@ static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream,
         rsnd_dai_stream_quit(io);
 }
 
+static int rsnd_soc_dai_prepare(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct rsnd_priv *priv = rsnd_dai_to_priv(dai);
+        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
+        struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
+
+        return rsnd_dai_call(prepare, io, priv);
+}
+
 static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
         .startup        = rsnd_soc_dai_startup,
         .shutdown       = rsnd_soc_dai_shutdown,
         .trigger        = rsnd_soc_dai_trigger,
         .set_fmt        = rsnd_soc_dai_set_fmt,
         .set_tdm_slot   = rsnd_soc_set_dai_tdm_slot,
+        .prepare        = rsnd_soc_dai_prepare,
 };
 
 void rsnd_parse_connect_common(struct rsnd_dai *rdai,
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 96d93330b1e1..8f7a0abfa751 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -280,6 +280,9 @@ struct rsnd_mod_ops {
         int (*nolock_stop)(struct rsnd_mod *mod,
                     struct rsnd_dai_stream *io,
                     struct rsnd_priv *priv);
+        int (*prepare)(struct rsnd_mod *mod,
+                       struct rsnd_dai_stream *io,
+                       struct rsnd_priv *priv);
 };
 
 struct rsnd_dai_stream;
@@ -309,6 +312,7 @@ struct rsnd_mod {
  * H    0: fallback
  * H    0: hw_params
  * H    0: pointer
+ * H    0: prepare
  */
 #define __rsnd_mod_shift_nolock_start   0
 #define __rsnd_mod_shift_nolock_stop    0
@@ -323,6 +327,7 @@ struct rsnd_mod {
 #define __rsnd_mod_shift_fallback       28 /* always called */
 #define __rsnd_mod_shift_hw_params      28 /* always called */
 #define __rsnd_mod_shift_pointer        28 /* always called */
+#define __rsnd_mod_shift_prepare        28 /* always called */
 
 #define __rsnd_mod_add_probe            0
 #define __rsnd_mod_add_remove           0
@@ -337,6 +342,7 @@ struct rsnd_mod {
 #define __rsnd_mod_add_fallback         0
 #define __rsnd_mod_add_hw_params        0
 #define __rsnd_mod_add_pointer          0
+#define __rsnd_mod_add_prepare          0
 
 #define __rsnd_mod_call_probe           0
 #define __rsnd_mod_call_remove          0
@@ -351,6 +357,7 @@ struct rsnd_mod {
 #define __rsnd_mod_call_pointer         0
 #define __rsnd_mod_call_nolock_start    0
 #define __rsnd_mod_call_nolock_stop     1
+#define __rsnd_mod_call_prepare         0
 
 #define rsnd_mod_to_priv(mod)   ((mod)->priv)
 #define rsnd_mod_name(mod)      ((mod)->ops->name)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 8304e4ec9242..3f880ec66459 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -283,7 +283,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod,
         if (rsnd_ssi_is_multi_slave(mod, io))
                 return 0;
 
-        if (ssi->usrcnt > 1) {
+        if (ssi->rate) {
                 if (ssi->rate != rate) {
                         dev_err(dev, "SSI parent/child should use same rate\n");
                         return -EINVAL;
@@ -434,7 +434,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
                          struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        int ret;
 
         if (!rsnd_ssi_is_run_mods(mod, io))
                 return 0;
@@ -443,10 +442,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
 
         rsnd_mod_power_on(mod);
 
-        ret = rsnd_ssi_master_clk_start(mod, io);
-        if (ret < 0)
-                return ret;
-
         rsnd_ssi_config_init(mod, io);
 
         rsnd_ssi_register_setup(mod);
@@ -852,6 +847,13 @@ static int rsnd_ssi_pio_pointer(struct rsnd_mod *mod,
         return 0;
 }
 
+static int rsnd_ssi_prepare(struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io,
+                            struct rsnd_priv *priv)
+{
+        return rsnd_ssi_master_clk_start(mod, io);
+}
+
 static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
         .name   = SSI_NAME,
         .probe  = rsnd_ssi_common_probe,
@@ -864,6 +866,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
         .pointer = rsnd_ssi_pio_pointer,
         .pcm_new = rsnd_ssi_pcm_new,
         .hw_params = rsnd_ssi_hw_params,
+        .prepare = rsnd_ssi_prepare,
 };
 
 static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
@@ -940,6 +943,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops = {
         .pcm_new = rsnd_ssi_pcm_new,
         .fallback = rsnd_ssi_fallback,
         .hw_params = rsnd_ssi_hw_params,
+        .prepare = rsnd_ssi_prepare,
 };
 
 int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod)