ASoC: rsnd: add DVC support

This patch adds DVC (Digital Volume Controller)
support which is member of CMD unit.

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

8 files changed, 376 insertions, 2 deletions

diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index a03268ec59c3..f4a706f82cb7 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -56,9 +56,17 @@ struct rsnd_src_platform_info {
         int dma_id; /* for Gen2 SCU */
 };
 
+/*
+ * flags
+ */
+struct rsnd_dvc_platform_info {
+        u32 flags;
+};
+
 struct rsnd_dai_path_info {
         struct rsnd_ssi_platform_info *ssi;
         struct rsnd_src_platform_info *src;
+        struct rsnd_dvc_platform_info *dvc;
 };
 
 struct rsnd_dai_platform_info {
@@ -83,6 +91,8 @@ struct rcar_snd_info {
         int ssi_info_nr;
         struct rsnd_src_platform_info *src_info;
         int src_info_nr;
+        struct rsnd_dvc_platform_info *dvc_info;
+        int dvc_info_nr;
         struct rsnd_dai_platform_info *dai_info;
         int dai_info_nr;
         int (*start)(int id);
diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile
index 7d0051ced838..9ac536429800 100644
--- a/sound/soc/sh/rcar/Makefile
+++ b/sound/soc/sh/rcar/Makefile
@@ -1,2 +1,2 @@
-snd-soc-rcar-objs       := core.o gen.o src.o adg.o ssi.o
+snd-soc-rcar-objs       := core.o gen.o src.o adg.o ssi.o dvc.o
 obj-$(CONFIG_SND_SOC_RCAR)      += snd-soc-rcar.o
\ No newline at end of file
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 41556b2ef21e..fc41a0e8b09f 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -57,6 +57,24 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
         return (0x6 + ws) << 8;
 }
 
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
+                                 struct rsnd_mod *mod,
+                                 struct rsnd_dai_stream *io)
+{
+        int id = rsnd_mod_id(mod);
+        int shift = (id % 2) ? 16 : 0;
+        u32 mask, val;
+
+        val = rsnd_adg_ssi_ws_timing_gen2(io);
+
+        val  = val      << shift;
+        mask = 0xffff   << shift;
+
+        rsnd_mod_bset(mod, CMDOUT_TIMSEL, mask, val);
+
+        return 0;
+}
+
 static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
                                         struct rsnd_mod *mod,
                                         struct rsnd_dai_stream *io,
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 378985b028ef..1f6981a56354 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -645,6 +645,11 @@ static int rsnd_path_init(struct rsnd_priv *priv,
         if (ret < 0)
                 return ret;
 
+        /* DVC */
+        ret = rsnd_path_parse(priv, io, dvc);
+        if (ret < 0)
+                return ret;
+
         return ret;
 }
 
@@ -869,6 +874,20 @@ static struct snd_pcm_ops rsnd_pcm_ops = {
 
 static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct rsnd_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        struct rsnd_dai *rdai;
+        int i, ret;
+
+        for_each_rsnd_dai(rdai, priv, i) {
+                ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
+                if (ret)
+                        return ret;
+
+                ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
+                if (ret)
+                        return ret;
+        }
+
         return snd_pcm_lib_preallocate_pages_for_all(
                 rtd->pcm,
                 SNDRV_DMA_TYPE_DEV,
@@ -908,6 +927,7 @@ static int rsnd_probe(struct platform_device *pdev)
                 rsnd_gen_probe,
                 rsnd_ssi_probe,
                 rsnd_src_probe,
+                rsnd_dvc_probe,
                 rsnd_adg_probe,
                 rsnd_dai_probe,
         };
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
new file mode 100644
index 000000000000..74769b1be005
--- /dev/null
+++ b/sound/soc/sh/rcar/dvc.c
@@ -0,0 +1,273 @@
+/*
+ * Renesas R-Car DVC support
+ *
+ * Copyright (C) 2014 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include "rsnd.h"
+
+#define RSND_DVC_NAME_SIZE      16
+#define RSND_DVC_VOLUME_MAX     100
+#define RSND_DVC_VOLUME_NUM     2
+struct rsnd_dvc {
+        struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
+        struct rsnd_mod mod;
+        struct clk *clk;
+        long volume[RSND_DVC_VOLUME_NUM];
+};
+
+#define rsnd_mod_to_dvc(_mod)   \
+        container_of((_mod), struct rsnd_dvc, mod)
+
+#define for_each_rsnd_dvc(pos, priv, i)                         \
+        for ((i) = 0;                                           \
+             ((i) < rsnd_dvc_nr(priv)) &&                       \
+             ((pos) = (struct rsnd_dvc *)(priv)->dvc + i);      \
+             i++)
+
+static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        u32 max = (0x00800000 - 1);
+        u32 vol[RSND_DVC_VOLUME_NUM];
+        int i;
+
+        for (i = 0; i < RSND_DVC_VOLUME_NUM; i++)
+                vol[i] = max / RSND_DVC_VOLUME_MAX * dvc->volume[i];
+
+        rsnd_mod_write(mod, DVC_VOL0R, vol[0]);
+        rsnd_mod_write(mod, DVC_VOL1R, vol[1]);
+}
+
+static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
+                         struct rsnd_dai *rdai)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(dvc_mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(dvc_mod);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(dvc_mod);
+        struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        int dvc_id = rsnd_mod_id(dvc_mod);
+        int src_id = rsnd_mod_id(src_mod);
+        u32 route[] = {
+                [0] = 0x30000,
+                [1] = 0x30001,
+                [2] = 0x40000,
+                [3] = 0x10000,
+                [4] = 0x20000,
+                [5] = 0x40100
+        };
+
+        if (src_id >= ARRAY_SIZE(route)) {
+                dev_err(dev, "DVC%d isn't connected to SRC%d\n", dvc_id, src_id);
+                return -EINVAL;
+        }