1 files changed, 65 insertions, 125 deletions

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 4d0720ed5a90..e3b078e7c3aa 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -18,21 +18,9 @@ struct rsnd_src {
 
 #define RSND_SRC_NAME_SIZE 16
 
-/*
- * ADINR
- */
-#define OTBL_24         (0 << 16)
-#define OTBL_22         (2 << 16)
-#define OTBL_20         (4 << 16)
-#define OTBL_18         (6 << 16)
-#define OTBL_16         (8 << 16)
-
-#define rsnd_src_mode_flags(p) ((p)->info->flags)
 #define rsnd_src_convert_rate(p) ((p)->info->convert_rate)
 #define rsnd_mod_to_src(_mod)                           \
         container_of((_mod), struct rsnd_src, mod)
-#define rsnd_src_hpbif_is_enable(src)   \
-        (rsnd_src_mode_flags(src) & RSND_SCU_USE_HPBIF)
 #define rsnd_src_dma_available(src) \
         rsnd_dma_available(rsnd_mod_to_dma(&(src)->mod))
 
@@ -80,34 +68,35 @@ struct rsnd_src {
  *
  * This driver request
  * struct rsnd_src_platform_info {
- *      u32 flags;
  *      u32 convert_rate;
+ *      int dma_id;
  * }
  *
- * rsnd_src_hpbif_is_enable() will be true
- * if flags had RSND_SRC_USE_HPBIF,
- * and it controls whether SSIU is used or not.
- *
  * rsnd_src_convert_rate() indicates
  * above convert_rate, and it controls
  * whether SRC is used or not.
  *
  * ex) doesn't use SRC
- * struct rsnd_src_platform_info info = {
- *      .flags = 0,
- *      .convert_rate = 0,
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], },
  * };
  *
  * ex) uses SRC
- * struct rsnd_src_platform_info info = {
- *      .flags = RSND_SRC_USE_HPBIF,
- *      .convert_rate = 48000,
+ * static struct rsnd_src_platform_info rsnd_src[] = {
+ *      RSND_SCU(48000, 0),
+ *      ...
+ * };
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], .src = &rsnd_src[0] },
  * };
  *
  * ex) uses SRC bypass mode
- * struct rsnd_src_platform_info info = {
- *      .flags = RSND_SRC_USE_HPBIF,
- *      .convert_rate = 0,
+ * static struct rsnd_src_platform_info rsnd_src[] = {
+ *      RSND_SCU(0, 0),
+ *      ...
+ * };
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], .src = &rsnd_src[0] },
  * };
  *
  */
@@ -116,27 +105,17 @@ struct rsnd_src {
  *              Gen1/Gen2 common functions
  */
 int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
-                           struct rsnd_dai *rdai,
-                           struct rsnd_dai_stream *io)
+                           struct rsnd_dai *rdai)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(ssi_mod);
         struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         int ssi_id = rsnd_mod_id(ssi_mod);
-        int has_src = 0;
 
         /*
          * SSI_MODE0
          */
-        if (info->dai_info) {
-                has_src = !!src_mod;
-        } else {
-                struct rsnd_src *src = rsnd_mod_to_src(src_mod);
-                has_src = rsnd_src_hpbif_is_enable(src);
-        }
-
         rsnd_mod_bset(ssi_mod, SSI_MODE0, (1 << ssi_id),
-                      has_src ? 0 : (1 << ssi_id));
+                      src_mod ? 0 : (1 << ssi_id));
 
         /*
          * SSI_MODE1
@@ -166,8 +145,7 @@ int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
 }
 
 int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai,
-                            struct rsnd_dai_stream *io)
+                            struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
 
@@ -203,13 +181,12 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
 }
 
 static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
-                                     struct rsnd_dai *rdai,
-                                     struct rsnd_dai_stream *io)
+                                     struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         u32 convert_rate = rsnd_src_convert_rate(src);
-        u32 adinr = runtime->channels;
         u32 fsrate = 0;
 
         if (convert_rate)
@@ -226,17 +203,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
         rsnd_mod_write(mod, SRC_SRCIR, 1);
 
         /* Set channel number and output bit length */
-        switch (runtime->sample_bits) {
-        case 16:
-                adinr |= OTBL_16;
-                break;
-        case 32:
-                adinr |= OTBL_24;
-                break;
-        default:
-                return -EIO;
-        }
-        rsnd_mod_write(mod, SRC_ADINR, adinr);
+        rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod));
 
         /* Enable the initial value of IFS */
         if (fsrate) {
@@ -253,8 +220,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -264,8 +230,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -275,8 +240,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai,
-                          struct rsnd_dai_stream *io)
+                          struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -294,8 +258,7 @@ static int rsnd_src_start(struct rsnd_mod *mod,
 
 
 static int rsnd_src_stop(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -313,9 +276,9 @@ static struct rsnd_mod_ops rsnd_src_non_ops = {
  *              Gen1 functions
  */
 static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
-                                   struct rsnd_dai *rdai,
-                                   struct rsnd_dai_stream *io)
+                                   struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct src_route_config {
                 u32 mask;
                 int shift;
@@ -351,9 +314,9 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai,
-                                            struct rsnd_dai_stream *io)
+                                            struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -410,12 +373,11 @@ static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai,
-                                          struct rsnd_dai_stream *io)
+                                          struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -432,24 +394,23 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai, io);
+        ret = rsnd_src_init(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_route_gen1(mod, rdai, io);
+        ret = rsnd_src_set_route_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen1(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen1(mod, rdai, io);
+        ret = rsnd_src_set_convert_timing_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -457,25 +418,23 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen1(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         int id = rsnd_mod_id(mod);
 
         rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), (1 << id));
 
-        return rsnd_src_start(mod, rdai, io);
+        return rsnd_src_start(mod, rdai);
 }
 
 static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int id = rsnd_mod_id(mod);
 
         rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), 0);
 
-        return rsnd_src_stop(mod, rdai, io);
+        return rsnd_src_stop(mod, rdai);
 }
 
 static struct rsnd_mod_ops rsnd_src_gen1_ops = {
@@ -490,17 +449,16 @@ static struct rsnd_mod_ops rsnd_src_gen1_ops = {
  *              Gen2 functions
  */
 static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai,
-                                          struct rsnd_dai_stream *io)
+                                          struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_mod_read(mod, SRC_ADINR));
-        rsnd_mod_write(mod, SSI_BUSIF_MODE,  rsnd_mod_read(mod, SRC_BUSIF_MODE));
+        rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_get_adinr(mod));
+        rsnd_mod_write(mod, SSI_BUSIF_MODE,  1);
 
         rsnd_mod_write(mod, SRC_SRCCR, 0x00011110);
 
@@ -511,9 +469,9 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai,
-                                            struct rsnd_dai_stream *io)
+                                            struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         u32 convert_rate = rsnd_src_convert_rate(src);
@@ -530,25 +488,16 @@ static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        struct rsnd_mod *ssi = rsnd_ssi_mod_get(priv, rsnd_mod_id(mod));
         struct device *dev = rsnd_priv_to_dev(priv);
         int ret;
-        int is_play;
-
-        if (info->dai_info)
-                is_play = rsnd_info_is_playback(priv, src);
-        else
-                is_play = rsnd_ssi_is_play(ssi);
 
         ret = rsnd_dma_init(priv,
                             rsnd_mod_to_dma(mod),
-                            is_play,
+                            rsnd_info_is_playback(priv, src),
                             src->info->dma_id);
         if (ret < 0)
                 dev_err(dev, "SRC DMA failed\n");
@@ -557,8 +506,7 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
-                                struct rsnd_dai *rdai,
-                                struct rsnd_dai_stream *io)
+                                struct rsnd_dai *rdai)
 {
         rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
 
@@ -566,20 +514,19 @@ static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai, io);
+        ret = rsnd_src_init(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen2(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate_gen2(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen2(mod, rdai, io);
+        ret = rsnd_src_set_convert_timing_gen2(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -587,22 +534,22 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
+        u32 val = rsnd_io_to_mod_dvc(io) ? 0x01 : 0x11;
 
         rsnd_dma_start(rsnd_mod_to_dma(&src->mod));
 
         rsnd_mod_write(mod, SSI_CTRL, 0x1);
-        rsnd_mod_write(mod, SRC_CTRL, 0x11);
+        rsnd_mod_write(mod, SRC_CTRL, val);
 
-        return rsnd_src_start(mod, rdai, io);
+        return rsnd_src_start(mod, rdai);
 }
 
 static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -611,7 +558,7 @@ static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
 
         rsnd_dma_stop(rsnd_mod_to_dma(&src->mod));
 
-        return rsnd_src_stop(mod, rdai, io);
+        return rsnd_src_stop(mod, rdai);
 }
 
 static struct rsnd_mod_ops rsnd_src_gen2_ops = {
@@ -699,11 +646,6 @@ int rsnd_src_probe(struct platform_device *pdev,
                 snprintf(name, RSND_SRC_NAME_SIZE, "src.%d", i);
 
                 clk = devm_clk_get(dev, name);
-                if (IS_ERR(clk)) {
-                        snprintf(name, RSND_SRC_NAME_SIZE, "scu.%d", i);
-                        clk = devm_clk_get(dev, name);
-                }
-
                 if (IS_ERR(clk))
                         return PTR_ERR(clk);
 
@@ -711,12 +653,10 @@ int rsnd_src_probe(struct platform_device *pdev,
                 src->clk = clk;
 
                 ops = &rsnd_src_non_ops;
-                if (rsnd_src_hpbif_is_enable(src)) {
-                        if (rsnd_is_gen1(priv))
-                                ops = &rsnd_src_gen1_ops;
-                        if (rsnd_is_gen2(priv))
-                                ops = &rsnd_src_gen2_ops;
-                }
+                if (rsnd_is_gen1(priv))
+                        ops = &rsnd_src_gen1_ops;
+                if (rsnd_is_gen2(priv))
+                        ops = &rsnd_src_gen2_ops;
 
                 rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);