Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2099bc8e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: rsnd_mod has rsnd_priv 



Each Renesas sound mod (= SSI/SRC/DVC) might be called from many paths
if it supports MIXer. In such case, mod <-> io is no longer 1:1
relationship. This means we can't use rsnd_mod_to_io() in SSI/SRC/DMA
interrupt handler. In such case, we need to check all io in interrupt
handler, and then, "priv" is needed.
This patch adds rsnd_priv pointer in rsnd_mod for prepare it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5451ea44

sound/soc/sh/rcar/core.c

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod) 
	return mod->ops->dma_req(mod);

}



int rsnd_mod_init(struct rsnd_mod *mod,

int rsnd_mod_init(struct rsnd_priv *priv,

		  struct rsnd_mod *mod,

		   struct rsnd_mod_ops *ops,

		   struct clk *clk,

		   enum rsnd_mod_type type,
@@ -160,6 +161,7 @@ int rsnd_mod_init(struct rsnd_mod *mod, 
	mod->ops	= ops;

	mod->type	= type;

	mod->clk	= clk;

	mod->priv	= priv;



	return ret;

}

sound/soc/sh/rcar/dvc.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ int rsnd_dvc_probe(struct platform_device *pdev, 


		dvc->info = &info->dvc_info[i];



		ret = rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops,

		ret = rsnd_mod_init(priv, &dvc->mod, &rsnd_dvc_ops,

			      clk, RSND_MOD_DVC, i);

		if (ret)

			return ret;

sound/soc/sh/rcar/rsnd.h

+4 −2
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ struct rsnd_mod { 
	struct rsnd_mod_ops *ops;

	struct rsnd_dma dma;

	struct rsnd_dai_stream *io;

	struct rsnd_priv *priv;

	struct clk *clk;

	u32 status;

};
@@ -300,14 +301,15 @@ struct rsnd_mod { 
#define __rsnd_mod_call_fallback	0

#define __rsnd_mod_call_hw_params	0



#define rsnd_mod_to_priv(mod) (rsnd_io_to_priv(rsnd_mod_to_io(mod)))

#define rsnd_mod_to_priv(mod) ((mod)->priv)

#define rsnd_mod_to_dma(mod) (&(mod)->dma)

#define rsnd_mod_to_io(mod) ((mod)->io)

#define rsnd_mod_id(mod) ((mod)->id)

#define rsnd_mod_hw_start(mod)	clk_enable((mod)->clk)

#define rsnd_mod_hw_stop(mod)	clk_disable((mod)->clk)



int rsnd_mod_init(struct rsnd_mod *mod,

int rsnd_mod_init(struct rsnd_priv *priv,

		  struct rsnd_mod *mod,

		   struct rsnd_mod_ops *ops,

		   struct clk *clk,

		   enum rsnd_mod_type type,

sound/soc/sh/rcar/src.c

+1 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ int rsnd_src_probe(struct platform_device *pdev, 


		src->info = &info->src_info[i];



		ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);

		ret = rsnd_mod_init(priv, &src->mod, ops, clk, RSND_MOD_SRC, i);

		if (ret)

			return ret;

	}

sound/soc/sh/rcar/ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ int rsnd_ssi_probe(struct platform_device *pdev, 
		else if (rsnd_ssi_pio_available(ssi))

			ops = &rsnd_ssi_pio_ops;



		ret = rsnd_mod_init(&ssi->mod, ops, clk, RSND_MOD_SSI, i);

		ret = rsnd_mod_init(priv, &ssi->mod, ops, clk, RSND_MOD_SSI, i);

		if (ret)

			return ret;