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

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

ASoC: rsnd: synchronize SSI start/stop sequence between PIO/DMA mode 



Current SSI start/stop sequence is different between PIO/DMA mode,
but, almost all are same. this patch synchronize it.
It will be shared in the future.

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

sound/soc/sh/rcar/ssi.c

+10 −5
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ static int rsnd_ssi_use_busif(struct rsnd_mod *mod) 
	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	int use_busif = 0;



	if (!rsnd_ssi_is_dma_mode(mod))

		return 0;



	if (!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_NO_BUSIF))

		use_busif = 1;

	if (rsnd_io_to_mod_src(io))
@@ -415,7 +418,7 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod, 
	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);



	rsnd_src_ssiu_start(mod, rdai, 0);

	rsnd_src_ssiu_start(mod, rdai, rsnd_ssi_use_busif(mod));



	rsnd_ssi_hw_start(ssi, rdai, io);
@@ -431,6 +434,8 @@ static int rsnd_ssi_pio_stop(struct rsnd_mod *mod, 


	rsnd_src_ssi_irq_disable(mod, rdai);



	rsnd_ssi_record_error(ssi, rsnd_mod_read(mod, SSISR));



	rsnd_ssi_hw_stop(ssi, rdai);



	rsnd_src_ssiu_stop(mod, rdai);
@@ -509,10 +514,10 @@ static int rsnd_ssi_dma_start(struct rsnd_mod *mod, 


	rsnd_src_ssiu_start(mod, rdai, rsnd_ssi_use_busif(mod));



	rsnd_dma_start(dma);



	rsnd_ssi_hw_start(ssi, ssi->rdai, io);



	rsnd_dma_start(dma);



	return 0;

}
@@ -522,12 +527,12 @@ static int rsnd_ssi_dma_stop(struct rsnd_mod *mod, 
	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_dma *dma = rsnd_mod_to_dma(&ssi->mod);



	rsnd_dma_stop(dma);



	rsnd_ssi_record_error(ssi, rsnd_mod_read(mod, SSISR));



	rsnd_ssi_hw_stop(ssi, rdai);



	rsnd_dma_stop(dma);



	rsnd_src_ssiu_stop(mod, rdai);



	return 0;