redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Kuninori Morimoto 2015-11-30 08:49:33 +00:00 committed by Mark Brown
parent 9445836430
commit c45f7263a8
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/sh/rcar/dvc.c
View file

@ -97,11 +97,15 @@ static void rsnd_dvc_volume_init(struct rsnd_dai_stream *io,
struct rsnd_mod *mod) struct rsnd_mod *mod)
{ {
struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod); struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
u32 adinr = 0;
u32 dvucr = 0; u32 dvucr = 0;
u32 vrctr = 0; u32 vrctr = 0;
u32 vrpdr = 0; u32 vrpdr = 0;
u32 vrdbr = 0; u32 vrdbr = 0;
adinr = rsnd_get_adinr_bit(mod, io) |
rsnd_get_adinr_chan(mod, io);
/* Enable Digital Volume, Zero Cross Mute Mode */ /* Enable Digital Volume, Zero Cross Mute Mode */
dvucr |= 0x101; dvucr |= 0x101;
@ -124,7 +128,7 @@ static void rsnd_dvc_volume_init(struct rsnd_dai_stream *io,
rsnd_mod_write(mod, DVC_DVUIR, 1); rsnd_mod_write(mod, DVC_DVUIR, 1);
/* General Information */ /* 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); rsnd_mod_write(mod, DVC_DVUCR, dvucr);
/* Volume Ramp Parameter */ /* Volume Ramp Parameter */

3
sound/soc/sh/rcar/src.c
View file

@ -199,7 +199,8 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
/* /*
* SRC_ADINR * 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 * SRC_IFSCR / SRC_IFSVR

3
sound/soc/sh/rcar/ssiu.c
View file

@ -82,7 +82,8 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
u32 val = rsnd_get_dalign(mod, io); u32 val = rsnd_get_dalign(mod, io);
rsnd_mod_write(mod, SSI_BUSIF_ADINR, 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_MODE, 1);
rsnd_mod_write(mod, SSI_BUSIF_DALIGN, val); rsnd_mod_write(mod, SSI_BUSIF_DALIGN, val);
} }