summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/dvc.c
diff options
context:
space:
mode:
authorKuninori Morimoto2015-11-30 09:49:33 +0100
committerMark Brown2015-11-30 19:11:23 +0100
commitc45f7263a805e1c5d8579569884d32141330589f (patch)
treeb098f224e32326dde053f4585b544e68482a1dcf /sound/soc/sh/rcar/dvc.c
parentASoC: rsnd: don't use normal *mod in adg.c (diff)
downloadkernel-qcow2-linux-c45f7263a805e1c5d8579569884d32141330589f.tar.gz
kernel-qcow2-linux-c45f7263a805e1c5d8579569884d32141330589f.tar.xz
kernel-qcow2-linux-c45f7263a805e1c5d8579569884d32141330589f.zip
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>
Diffstat (limited to 'sound/soc/sh/rcar/dvc.c')
-rw-r--r--sound/soc/sh/rcar/dvc.c6
1 files changed, 5 insertions, 1 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 */