Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c45f7263 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 94458364

sound/soc/sh/rcar/dvc.c

+5 −1
Original line number Diff line number Diff line
@@ -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 */

sound/soc/sh/rcar/src.c

+2 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/sh/rcar/ssiu.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

	}