ASoC: rsnd: ssi: Request dedicated dma channels for busif0 to 7
Subsystems (3)
PATCH v3 1/1 ASoC: rsnd: ssi: Request dedicated dma channels for busif0 to 7
From: Jiada Wang <[email protected]>
Currently ssi driver only requests dma channel for SSI_0, with naming of 'rxu/txu', which is used to transfer data to/from busif0. But for GEN2/GEN3, there are also busif1 ~ busif7, which need to be used when SSI works in TDM Split/Ex-Split mode.
This patch adds support to firstly try to request busif indexed dma channel with naming "rxu[busif]/txu[busif]", if these dma channel don't exist, then try to request 'rxu/txu' dma channel to keep compatibility with platform hasn't had device-tree updated.
---
v3:
- Drop device-tree changes
- Drop automatic busif selection
v2:
- Instead of configure BUSIF by kctl interface "SSI Out/In BUSIF", use rsnd_ssi_select_busif() to automatically select BUSIF.
- Keep 'rxu/txu' dma request, to keep compatibility with GEN2 series
- Re-order patch-set to satisfy git bisect
v1: initial version
--- sound/soc/sh/rcar/ssi.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-)
sound/soc/sh/rcar/ssi.c +32 -5
@@ -76,6 +76,8 @@#define SSI_NAME "ssi" +#define SSI_DMA_NAME_SIZE 10 +struct rsnd_ssi {struct rsnd_mod mod;
@@ -938,12 +940,37 @@ static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io, {struct rsnd_priv *priv =rsnd_mod_to_priv (mod);int is_play =rsnd_io_is_play (io); -char *name; +char name[SSI_DMA_NAME_SIZE ]; -if (rsnd_ssi_use_busif (io)) - name = is_play ?"rxu" :"txu" ; -else - name = is_play ?"rx" :"tx" ; +if (rsnd_ssi_use_busif (io)) { +int busif =rsnd_ssi_get_busif (io); +struct dma_chan *chan =NULL ; + +/* try to request rxu/txu channel with busif index first */ +if (is_play) +snprintf (name,SSI_DMA_NAME_SIZE ,"rxu%d" , busif); +else +snprintf (name,SSI_DMA_NAME_SIZE ,"txu%d" , busif); + + chan =rsnd_dma_request_channel (rsnd_ssi_of_node (priv), + mod, name); +if (!IS_ERR (chan)) +return chan; + +/* +* If dma channel with busif index doesn't exist +* request rxu/txu dma channel +*/ +if (is_play) +snprintf (name,SSI_DMA_NAME_SIZE ,"rxu" ); +else +snprintf (name,SSI_DMA_NAME_SIZE ,"txu" ); + }else { +if (is_play) +snprintf (name,SSI_DMA_NAME_SIZE ,"rx" ); +else +snprintf (name,SSI_DMA_NAME_SIZE ,"tx" ); + }return rsnd_dma_request_channel (rsnd_ssi_of_node (priv), mod, name);
Signature · 1 line
2.17.0
Hi
Quoted 5 lines
Currently ssi driver only requests dma channel for
SSI_0, with naming of 'rxu/txu', which is used to transfer data to/from busif0. But for GEN2/GEN3, there are also busif1 ~ busif7, which need to be used when SSI works in TDM Split/Ex-Split mode.
Quoted 7 lines
This patch adds support to firstly try to request busif indexed dma channel with naming "rxu[busif]/txu[busif]", if these dma channel don't exist, then try to request 'rxu/txu' dma channel to keep compatibility with platform hasn't had device-tree updated.
Signed-off-by Jiada Wang <[email protected]>---
In my understanding, we agreed that we will have new "ssiu" on DT. This means "ssi" side expansion is no longer needed.
Of course we need to consider about compatibility then.
Best regards
---
Kuninori Morimoto