openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rsnd: tidyup SRC position on each code 

This is cleanup for CTU/MIX support

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2015-07-15 07:16:37 +00:00 committed by Mark Brown
parent 5cbbadd3d5
commit 78edead449
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sh/rcar/Makefile
View File

@ -1,4 +1,4 @@
snd-soc-rcar-objs := core.o gen.o dma.o src.o adg.o ssi.o dvc.o snd-soc-rcar-objs := core.o gen.o dma.o adg.o ssi.o src.o dvc.o
obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o
snd-soc-rsrc-card-objs := rsrc-card.o snd-soc-rsrc-card-objs := rsrc-card.o

8
sound/soc/sh/rcar/core.c
View File

@ -641,13 +641,13 @@ static int rsnd_path_init(struct rsnd_priv *priv,
* using fixed path. * using fixed path.
*/ */
/* SRC */ /* SSI */
ret = rsnd_path_add(priv, io, src); ret = rsnd_path_add(priv, io, ssi);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* SSI */ /* SRC */
ret = rsnd_path_add(priv, io, ssi); ret = rsnd_path_add(priv, io, src);
if (ret < 0) if (ret < 0)
return ret; return ret;

38
sound/soc/sh/rcar/rsnd.h
View File

@ -440,12 +440,6 @@ struct rsnd_priv {
*/ */
void *gen; void *gen;
/*
* below value will be filled on rsnd_src_probe()
*/
void *src;
int src_nr;
/* /*
* below value will be filled on rsnd_adg_probe() * below value will be filled on rsnd_adg_probe()
*/ */
@ -462,6 +456,12 @@ struct rsnd_priv {
void *ssi; void *ssi;
int ssi_nr; int ssi_nr;
/*
* below value will be filled on rsnd_src_probe()
*/
void *src;
int src_nr;
/* /*
* below value will be filled on rsnd_dvc_probe() * below value will be filled on rsnd_dvc_probe()
*/ */
@ -534,6 +534,19 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
const char * const *texts, const char * const *texts,
u32 max); u32 max);
/*
* R-Car SSI
*/
int rsnd_ssi_probe(struct platform_device *pdev,
const struct rsnd_of_data *of_data,
struct rsnd_priv *priv);
void rsnd_ssi_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);
int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod);
/* /*
* R-Car SRC * R-Car SRC
*/ */
@ -554,19 +567,6 @@ int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod); int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod);
int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod); int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);
/*
* R-Car SSI
*/
int rsnd_ssi_probe(struct platform_device *pdev,
const struct rsnd_of_data *of_data,
struct rsnd_priv *priv);
void rsnd_ssi_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);
int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod);
/* /*
* R-Car DVC * R-Car DVC
*/ */