ASoC: rsnd: enable single DVC valume settings
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 5 Nov 2014 04:28:10 +0000 (20:28 -0800)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 04:21:51 +0000 (13:21 +0900)
DVC controls some digital volume features.
Some of them requests values for "each channels",
but, some of them requests values for "feature".
And, Volume Ramp has "feature" settings.
This patch adds rsnd_dvc_cfg_s and care about
single settings.
Compiler will report like below at this point,
but, it will be removed if Volume Ramp was supported.
  warning: '_rsnd_dvc_pcm_new_s' defined but not used

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit ab2e479667507329475c8ef93d61f3dbe654c3c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
sound/soc/sh/rcar/dvc.c

index c729e26..e7cfc71 100644 (file)
@@ -26,6 +26,11 @@ struct rsnd_dvc_cfg_m {
        u32 val[RSND_DVC_CHANNELS];
 };
 
+struct rsnd_dvc_cfg_s {
+       struct rsnd_dvc_cfg cfg;
+       u32 val;
+};
+
 struct rsnd_dvc {
        struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
        struct rsnd_mod mod;
@@ -248,6 +253,19 @@ static int _rsnd_dvc_pcm_new_m(struct rsnd_mod *mod,
        return __rsnd_dvc_pcm_new(mod, rdai, rtd, name, &private->cfg);
 }
 
+static int _rsnd_dvc_pcm_new_s(struct rsnd_mod *mod,
+                              struct rsnd_dai *rdai,
+                              struct snd_soc_pcm_runtime *rtd,
+                              const unsigned char *name,
+                              struct rsnd_dvc_cfg_s *private,
+                              u32 max)
+{
+       private->cfg.max        = max;
+       private->cfg.size       = 1;
+       private->cfg.val        = &private->val;
+       return __rsnd_dvc_pcm_new(mod, rdai, rtd, name, &private->cfg);
+}
+
 static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
                            struct rsnd_dai *rdai,
                            struct snd_soc_pcm_runtime *rtd)