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

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

ASoC: rsnd: move DVC_DVUER settings under rsnd_dvc_volume_update() 



We need to Enable/Disable DVC_DVUER register if we set
DVCp_ZCMCR, DVCp_VRCTR, DVCp_VRPDR, DVCp_VRDBR,
DVCp_VOL0R, DVCp_VOL1R, DVCp_VOL2R, DVCp_VOL3R,
DVCp_VOL4R, DVCp_VOL5R, DVCp_VOL6R, DVCp_VOL7R
and, these are controlled under rsnd_dvc_volume_update().
This patch moves DVC_DVUER settings to it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1c5d1c98

sound/soc/sh/rcar/dvc.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -48,6 +48,9 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod) 
		mute |= (!!dvc->mute.val[i]) << i;

		mute |= (!!dvc->mute.val[i]) << i;

	}

	}





	/* Disable DVC Register access */

	rsnd_mod_write(mod, DVC_DVUER, 0);



	/* Enable Digital Volume */

	/* Enable Digital Volume */

	dvucr = 0x100;

	dvucr = 0x100;

	rsnd_mod_write(mod, DVC_VOL0R, dvc->volume.val[0]);

	rsnd_mod_write(mod, DVC_VOL0R, dvc->volume.val[0]);
@@ -60,6 +63,9 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod) 
	}

	}





	rsnd_mod_write(mod, DVC_DVUCR, dvucr);

	rsnd_mod_write(mod, DVC_DVUCR, dvucr);



	/* Enable DVC Register access */

	rsnd_mod_write(mod, DVC_DVUER, 1);

}

}





static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,

static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
@@ -117,8 +123,6 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod, 




	rsnd_mod_write(dvc_mod, DVC_DVUIR, 0);

	rsnd_mod_write(dvc_mod, DVC_DVUIR, 0);





	rsnd_mod_write(dvc_mod, DVC_DVUER, 1);



	rsnd_adg_set_cmd_timsel_gen2(rdai, dvc_mod, io);

	rsnd_adg_set_cmd_timsel_gen2(rdai, dvc_mod, io);





	return 0;

	return 0;