From 7b466fc6130a4183b505ebbd8220b55335f69d88 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 27 Nov 2014 08:05:54 +0000 Subject: [PATCH] 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: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 3c0d31df6d6c..292e98b3c980 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -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; -- 2.20.1