Commit 0e289012 authored by Jiada Wang's avatar Jiada Wang Committed by Mark Brown

ASoC: rsnd: ssi: Fix issue in dma data address assignment

Same SSI device may be used in different dai links,
by only having one dma struct in rsnd_ssi, after the first
instance's dma config be initilized, the following instances
can no longer configure dma, this causes issue, when their
dma data address are different from the first instance.
Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarTimo Wischer <twischer@de.adit-jv.com>
[Kuninori: tidyup for upstream]
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b735662f
...@@ -431,6 +431,7 @@ struct rsnd_dai_stream { ...@@ -431,6 +431,7 @@ struct rsnd_dai_stream {
char name[RSND_DAI_NAME_SIZE]; char name[RSND_DAI_NAME_SIZE];
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct rsnd_mod *mod[RSND_MOD_MAX]; struct rsnd_mod *mod[RSND_MOD_MAX];
struct rsnd_mod *dma;
struct rsnd_dai *rdai; struct rsnd_dai *rdai;
struct device *dmac_dev; /* for IPMMU */ struct device *dmac_dev; /* for IPMMU */
u32 parent_ssi_status; u32 parent_ssi_status;
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
struct rsnd_ssi { struct rsnd_ssi {
struct rsnd_mod mod; struct rsnd_mod mod;
struct rsnd_mod *dma;
u32 flags; u32 flags;
u32 cr_own; u32 cr_own;
...@@ -899,7 +898,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, ...@@ -899,7 +898,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
struct rsnd_priv *priv) struct rsnd_priv *priv)
{ {
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
int ret; int ret;
/* /*
...@@ -914,7 +912,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, ...@@ -914,7 +912,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
return ret; return ret;
/* SSI probe might be called many times in MUX multi path */ /* SSI probe might be called many times in MUX multi path */
ret = rsnd_dma_attach(io, mod, &ssi->dma); ret = rsnd_dma_attach(io, mod, &io->dma);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment