| From c5e57c13b158c62aa7ed172f8ef43482cf75e216 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 15 Jul 2015 07:16:37 +0000 |
| Subject: [PATCH 303/326] 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> |
| (cherry picked from commit 78edead4494219640d9fdf37d76beae24f79de9e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/Makefile | 2 +- |
| sound/soc/sh/rcar/core.c | 8 ++++---- |
| sound/soc/sh/rcar/rsnd.h | 38 +++++++++++++++++++------------------- |
| 3 files changed, 24 insertions(+), 24 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile |
| index f1b445173fba..3a274fd3593c 100644 |
| --- a/sound/soc/sh/rcar/Makefile |
| +++ b/sound/soc/sh/rcar/Makefile |
| @@ -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 |
| |
| snd-soc-rsrc-card-objs := rsrc-card.o |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index 8919afabe48f..e20d8ea0aafe 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -641,13 +641,13 @@ static int rsnd_path_init(struct rsnd_priv *priv, |
| * using fixed path. |
| */ |
| |
| - /* SRC */ |
| - ret = rsnd_path_add(priv, io, src); |
| + /* SSI */ |
| + ret = rsnd_path_add(priv, io, ssi); |
| if (ret < 0) |
| return ret; |
| |
| - /* SSI */ |
| - ret = rsnd_path_add(priv, io, ssi); |
| + /* SRC */ |
| + ret = rsnd_path_add(priv, io, src); |
| if (ret < 0) |
| return ret; |
| |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index 5f5b8b1118b2..7fee2079ba5a 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -441,12 +441,6 @@ struct rsnd_priv { |
| 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() |
| */ |
| void *adg; |
| @@ -463,6 +457,12 @@ struct rsnd_priv { |
| 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() |
| */ |
| void *dvc; |
| @@ -535,6 +535,19 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod, |
| 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 |
| */ |
| int rsnd_src_probe(struct platform_device *pdev, |
| @@ -555,19 +568,6 @@ int rsnd_src_ssi_irq_enable(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 |
| */ |
| int rsnd_dvc_probe(struct platform_device *pdev, |
| -- |
| 2.6.2 |
| |