diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-01-21 01:58:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-22 17:12:25 +0000 |
| commit | 355cb84fbe1f098f80c17dad9027ad2c6aec3fa0 (patch) | |
| tree | 948f2c374aa16da922943ddb774cc232dfb7e615 /sound/soc/sh/rcar/rsnd.h | |
| parent | 5ba17b42e1755c3c5cfe96370cfd47f34d01f62c (diff) | |
| download | linux-next-355cb84fbe1f098f80c17dad9027ad2c6aec3fa0.tar.gz | |
ASoC: rsnd: attach Audio-DMAC-periperi correctly
SSI/SRC will try to attach DMAC as Audio-DMAC or Audio-DMAC-periperi.
It is fixed IP, but will be attached to each streams as different module
in case of MUX (= multi sound path will be merged).
This patch solves this issue.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/rsnd.h')
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 28602607cf5e..90c732e265a2 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -166,8 +166,8 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); /* * R-Car DMA */ -struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io, - struct rsnd_mod *mod, int id); +int rsnd_dma_attach(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, struct rsnd_mod **dma_mod, int id); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); |