ASoC: rsnd: add busif property to dai stream
Subsystems (3)
PATCH 9/10 ASoC: rsnd: add busif property to dai stream
From: Jiada Wang <[email protected]>
SSI may use different busif for data transfer, this patch adds busif property to each dai stream, to indicate the busif used by playback/capture stream.
--- sound/soc/sh/rcar/core.c | 16 +++++++++++++++- sound/soc/sh/rcar/rsnd.h | 3 +++ sound/soc/sh/rcar/ssi.c | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-)
sound/soc/sh/rcar/core.c +15 -1
@@ -560,6 +560,14 @@ struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id)return priv->rdai + id; } +struct rsnd_kctrl_cfg_s *rsnd_busif_get (struct rsnd_priv *priv,int id) +{ +if ((id <0 ) || (id >=2 *rsnd_rdai_nr (priv))) +return NULL ; + +return priv->busif + id; +} +static struct snd_soc_dai_driver *rsnd_daidrv_get (struct rsnd_priv *priv,int id) {
@@ -1045,6 +1053,9 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, io_playback = &rdai->playback; io_capture = &rdai->capture; + io_playback->busif =rsnd_busif_get (priv, dai_i); + io_capture->busif =rsnd_busif_get (priv,rsnd_rdai_nr (priv) + dai_i); +snprintf (rdai->name,RSND_DAI_NAME_SIZE ,"rsnd-dai.%d" , dai_i); rdai->priv = priv;
@@ -1108,6 +1119,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)struct snd_soc_dai_driver *rdrv;struct device *dev =rsnd_priv_to_dev (priv);struct rsnd_dai *rdai; +struct rsnd_kctrl_cfg_s *busif;int nr;int is_graph;int dai_i;
@@ -1123,12 +1135,14 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) rdrv =devm_kcalloc (dev, nr,sizeof (*rdrv),GFP_KERNEL ); rdai =devm_kcalloc (dev, nr,sizeof (*rdai),GFP_KERNEL ); -if (!rdrv || !rdai) + busif =devm_kcalloc (dev,2 * nr,sizeof (*busif),GFP_KERNEL ); +if (!rdrv || !rdai || !busif)return -ENOMEM ; priv->rdai_nr = nr; priv->daidrv = rdrv; priv->rdai = rdai; + priv->busif = busif;/* * parse all dai
sound/soc/sh/rcar/rsnd.h +3 -0
@@ -456,6 +456,7 @@ struct rsnd_dai_stream {struct rsnd_mod *dma;struct rsnd_dai *rdai;struct device *dmac_dev;/* for IPMMU */ +struct rsnd_kctrl_cfg_s *busif;u32 parent_ssi_status; };#define rsnd_io_to_mod (io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL)
@@ -629,6 +630,8 @@ struct rsnd_priv {*/ struct snd_soc_dai_driver *daidrv;struct rsnd_dai *rdai; +struct rsnd_kctrl_cfg_s *busif; +int rdai_nr; };
sound/soc/sh/rcar/ssi.c +4 -1
@@ -154,7 +154,10 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io)int rsnd_ssi_get_busif (struct rsnd_dai_stream *io) { -return 0 ;/* BUSIF0 only for now */ +if (!rsnd_ssi_use_busif (io)) +return 0 ; + +return io->busif->val; }static void rsnd_ssi_status_clear (struct rsnd_mod *mod)
Signature · 1 line
2.17.0
Hi Jiada
Quoted 3 lines
SSI may use different busif for data transfer, this patch adds busif property to each dai stream, to indicate the busif used by playback/capture stream.
(snip)
Quoted 2 lines
sound/soc/sh/rcar/core.c +2
-0+ io_playback->busif =rsnd_busif_get (priv, dai_i); + io_capture->busif =rsnd_busif_get (priv,rsnd_rdai_nr (priv) + dai_i);
(snip)
Quoted 1 line
sound/soc/sh/rcar/core.c +1
-0+ busif =devm_kcalloc (dev,2 * nr,sizeof (*busif),GFP_KERNEL );
(snip)
sound/soc/sh/rcar/rsnd.h struct rsnd_dai_stream { · line 461
Quoted 7 lines
sound/soc/sh/rcar/rsnd.h +1
-0@@ -456,6 +456,7 @@ struct rsnd_dai_stream {struct rsnd_mod *dma;struct rsnd_dai *rdai;struct device *dmac_dev;/* for IPMMU */ +struct rsnd_kctrl_cfg_s *busif;u32 parent_ssi_status; };
It looks very complex to me.
Why don't you just have "busif" on rsnd_dai_stream, instead of "*busif" ?
sound/soc/sh/rcar/ssi.c int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) · line 161
Quoted 8 lines
sound/soc/sh/rcar/ssi.c +0
-0int rsnd_ssi_get_busif (struct rsnd_dai_stream *io){
sound/soc/sh/rcar/ssi.c +4
-1-return 0 ;/* BUSIF0 only for now */ +if (!rsnd_ssi_use_busif (io)) +return 0 ; + +return io->busif->val; }
Who/How update val ?
Hi Morimoto-san
Quoted 12 lines · Kuninori Morimoto
Hi Jiada
Quoted 3 lines
SSI may use different busif for data transfer, this patch adds busif property to each dai stream, to indicate the busif used by playback/capture stream.
(snip)
Quoted 2 lines
sound/soc/sh/rcar/core.c +2
-0+ io_playback->busif =rsnd_busif_get (priv, dai_i); + io_capture->busif =rsnd_busif_get (priv,rsnd_rdai_nr (priv) + dai_i);(snip)
Quoted 1 line
sound/soc/sh/rcar/core.c +1
-0+ busif =devm_kcalloc (dev,2 * nr,sizeof (*busif),GFP_KERNEL );(snip)
Quoted 9 lines
sound/soc/sh/rcar/rsnd.h struct rsnd_dai_stream { · line 461
Quoted 7 lines
sound/soc/sh/rcar/rsnd.h +1
-0@@ -456,6 +456,7 @@ struct rsnd_dai_stream {struct rsnd_mod *dma;struct rsnd_dai *rdai;struct device *dmac_dev;/* for IPMMU */ +struct rsnd_kctrl_cfg_s *busif;u32 parent_ssi_status; };It looks very complex to me.
Why don't you just have "busif" onrsnd_dai_stream, instead of "*busif" ?
yes, it can be replaced with *busif instead,
but it will result in some reorder of declarations in rsnd.h will update this patch in v2 patch set.
Thanks,
Jiada
Quoted 10 lines
sound/soc/sh/rcar/ssi.c int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) · line 161
Quoted 8 lines
sound/soc/sh/rcar/ssi.c +0
-0int rsnd_ssi_get_busif (struct rsnd_dai_stream *io){sound/soc/sh/rcar/ssi.c +4
-1-return 0 ;/* BUSIF0 only for now */ +if (!rsnd_ssi_use_busif (io)) +return 0 ; + +return io->busif->val; }Who/How update val ?