Skip to content

Commit

Permalink
ASoC: rsnd: DMA start address is properly used for each DMAC
Browse files Browse the repository at this point in the history
R-Car sound uses Audio DMAC and Audio DMAC peri peri.
Audio DMAC peri peri transfers data inside circuit.

DMA transfer needs source / destination address,
and destination address can be set via dmaengine_slave_config().
The source address can be set when starting DMAEngine.
Because Audio DMAC peri peri always ignores its value,
current driver always used same source address for
Audio DMAC / Audio DMAC peri peri
(Audio DMAC peri peri source / destination address
is always fixed value)
But, This is not good match for DT booting.
This patch properly uses DMA start address
for Audio DMAC / Audio DMAC peri peri.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jul 2, 2014
1 parent 3752303 commit 3403710
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sound/soc/sh/rcar/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ void rsnd_dma_start(struct rsnd_dma *dma)
struct dma_async_tx_descriptor *desc;

desc = dmaengine_prep_dma_cyclic(dma->chan,
(dma->addr) ? dma->addr :
substream->runtime->dma_addr,
snd_pcm_lib_buffer_bytes(substream),
snd_pcm_lib_period_bytes(substream),
Expand Down Expand Up @@ -347,6 +348,7 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
if (ret < 0)
goto rsnd_dma_init_err;

dma->addr = is_play ? cfg.src_addr : cfg.dst_addr;
dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;

return 0;
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sh/rcar/rsnd.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ struct rsnd_dma {
struct sh_dmae_slave slave;
struct dma_chan *chan;
enum dma_transfer_direction dir;
dma_addr_t addr;
};

void rsnd_dma_start(struct rsnd_dma *dma);
Expand Down

0 comments on commit 3403710

Please sign in to comment.