ASoC: rsnd: add missing ADINR::CHNUM on DVC/SRC/SSIU

DVC/SRC/SSIU needs ADINR::CHNUM settings too. This patch adds
these missing value.

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

3 files changed, 9 insertions, 3 deletions

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 0f61e1344431..c622dec24362 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -97,11 +97,15 @@ static void rsnd_dvc_volume_init(struct rsnd_dai_stream *io,
                                  struct rsnd_mod *mod)
 {
         struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        u32 adinr = 0;
         u32 dvucr = 0;
         u32 vrctr = 0;
         u32 vrpdr = 0;
         u32 vrdbr = 0;
 
+        adinr = rsnd_get_adinr_bit(mod, io) |
+                rsnd_get_adinr_chan(mod, io);
+
         /* Enable Digital Volume, Zero Cross Mute Mode */
         dvucr |= 0x101;
 
@@ -124,7 +128,7 @@ static void rsnd_dvc_volume_init(struct rsnd_dai_stream *io,
         rsnd_mod_write(mod, DVC_DVUIR, 1);
 
         /* General Information */
-        rsnd_mod_write(mod, DVC_ADINR, rsnd_get_adinr_bit(mod, io));
+        rsnd_mod_write(mod, DVC_ADINR, adinr);
         rsnd_mod_write(mod, DVC_DVUCR, dvucr);
 
         /* Volume Ramp Parameter */
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 6d93c4ed8275..30cad79deab0 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -199,7 +199,8 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
         /*
          *      SRC_ADINR
          */
-        adinr = rsnd_get_adinr_bit(mod, io);
+        adinr = rsnd_get_adinr_bit(mod, io) |
+                rsnd_get_adinr_chan(mod, io);
 
         /*
          *      SRC_IFSCR / SRC_IFSVR
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index bc245047e904..6120b0a66958 100644
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -82,7 +82,8 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
                 u32 val = rsnd_get_dalign(mod, io);
 
                 rsnd_mod_write(mod, SSI_BUSIF_ADINR,
-                               rsnd_get_adinr_bit(mod, io));
+                               rsnd_get_adinr_bit(mod, io) |
+                               rsnd_get_adinr_chan(mod, io));
                 rsnd_mod_write(mod, SSI_BUSIF_MODE,  1);
                 rsnd_mod_write(mod, SSI_BUSIF_DALIGN, val);
         }