[11/12] ASoC: rsnd: DMA start address is properly used for each DMAC
diff mbox

Message ID 87wqcey4rl.wl%kuninori.morimoto.gx@renesas.com
State New, archived
Headers show

Commit Message

Kuninori Morimoto June 18, 2014, 8:57 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 sound/soc/sh/rcar/core.c |    2 ++
 sound/soc/sh/rcar/rsnd.h |    1 +
 2 files changed, 3 insertions(+)

Comments

Sergei Shtylyov June 18, 2014, 2:22 p.m. UTC | #1
On 06/18/2014 12:57 PM, Kuninori Morimoto wrote:

> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> 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>
> ---
>   sound/soc/sh/rcar/core.c |    2 ++
>   sound/soc/sh/rcar/rsnd.h |    1 +
>   2 files changed, 3 insertions(+)

> diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
> index 36895eb..6fb89fc 100644
> --- a/sound/soc/sh/rcar/core.c
> +++ b/sound/soc/sh/rcar/core.c
> @@ -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 :

    () not needed at all.

[...]

WBR, Sergei

Patch
diff mbox

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 36895eb..6fb89fc 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -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),
@@ -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_TO_DEVICE : DMA_FROM_DEVICE;
 
 	return 0;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 70a91b0..f75c535 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -158,6 +158,7 @@  struct rsnd_dma {
 	struct sh_dmae_slave	slave;
 	struct dma_chan		*chan;
 	enum dma_data_direction dir;
+	dma_addr_t		addr;
 };
 
 void rsnd_dma_start(struct rsnd_dma *dma);