iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rsnd: route setting is needed only Gen1

Browse Source 
Renesas sound has SRC (= Sampling Rate Converter),
but, the HW implementation depends on its generation.
It was part of SRU on Gen1, and SCU on Gen2.
This SCU needs DMA transfer to use it.
Current rsnd driver is using it as DMA transfer buffer
(= no rate convert), and Gen1 is only supported at this point.

This patch cleanup it with focusing about SRC and Gen2 part.

rsnd_scu_set_route() is needed only Gen1.

This patch renames it to rsnd_scu_set_route_if_gen1()
and it adds comment to rsnd_reg member
in order to clarify it is used for Gen1.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Kuninori Morimoto 2013-12-19 19:27:37 -08:00 committed by Mark Brown
parent 7808aa30d6
commit 2582718cb6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,11 +32,11 @@
*/ */
enum rsnd_reg { enum rsnd_reg {
/* SRU/SCU/SSIU */ /* SRU/SCU/SSIU */
RSND_REG_SRC_ROUTE_SEL, RSND_REG_SRC_ROUTE_SEL, /* for Gen1 */
RSND_REG_SRC_TMG_SEL0, RSND_REG_SRC_TMG_SEL0, /* for Gen1 */
RSND_REG_SRC_TMG_SEL1, RSND_REG_SRC_TMG_SEL1, /* for Gen1 */
RSND_REG_SRC_TMG_SEL2, RSND_REG_SRC_TMG_SEL2, /* for Gen1 */
RSND_REG_SRC_ROUTE_CTRL, RSND_REG_SRC_ROUTE_CTRL, /* for Gen1 */
RSND_REG_SSI_MODE0, RSND_REG_SSI_MODE0,
RSND_REG_SSI_MODE1, RSND_REG_SSI_MODE1,
RSND_REG_BUSIF_MODE, RSND_REG_BUSIF_MODE,

6
sound/soc/sh/rcar/scu.c
View File

@ -36,7 +36,8 @@ struct rsnd_scu {
((pos) = (struct rsnd_scu *)(priv)->scu + i); \ ((pos) = (struct rsnd_scu *)(priv)->scu + i); \
i++) i++)
static int rsnd_scu_set_route(struct rsnd_priv *priv, /* Gen1 only */
static int rsnd_src_set_route_if_gen1(struct rsnd_priv *priv,
struct rsnd_mod *mod, struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
@ -174,7 +175,8 @@ static int rsnd_scu_start(struct rsnd_mod *mod,
} }
/* it use DMA transter */ /* it use DMA transter */
ret = rsnd_scu_set_route(priv, mod, rdai, io);
ret = rsnd_src_set_route_if_gen1(priv, mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;