UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rsnd: tidyup register naming of BUSIF_MODE 

Gen1:SRU has only 1 BUSIF_MODE,
but Gen2:SSIU/SCU has SRCm_BUSIF_MODE, and SSIn_BUSIF_MODE.
This patch rename current BUSIF_MODE to SRC_BUSIF_MODE.

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 2014-01-23 18:37:39 -08:00 committed by Mark Brown
parent 38dbfb59d1
commit 0290d2a42c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sh/rcar/gen.c
View File

@ -317,7 +317,7 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
RSND_GEN1_S_REG(gen, SRU, SRC_ROUTE_CTRL, 0xc0), RSND_GEN1_S_REG(gen, SRU, SRC_ROUTE_CTRL, 0xc0),
RSND_GEN1_S_REG(gen, SRU, SSI_MODE0, 0xD0), RSND_GEN1_S_REG(gen, SRU, SSI_MODE0, 0xD0),
RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4), RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4),
RSND_GEN1_M_REG(gen, SRU, BUSIF_MODE, 0x20, 0x4), RSND_GEN1_M_REG(gen, SRU, SRC_BUSIF_MODE, 0x20, 0x4),
RSND_GEN1_M_REG(gen, SRU, SRC_ROUTE_MODE0,0x50, 0x8), RSND_GEN1_M_REG(gen, SRU, SRC_ROUTE_MODE0,0x50, 0x8),
RSND_GEN1_M_REG(gen, SRU, SRC_SWRSR, 0x200, 0x40), RSND_GEN1_M_REG(gen, SRU, SRC_SWRSR, 0x200, 0x40),
RSND_GEN1_M_REG(gen, SRU, SRC_SRCIR, 0x204, 0x40), RSND_GEN1_M_REG(gen, SRU, SRC_SRCIR, 0x204, 0x40),

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

@ -39,8 +39,8 @@ enum rsnd_reg {
RSND_REG_SRC_ROUTE_CTRL, /* for Gen1 */ 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_INT_ENABLE, /* for Gen2 */ RSND_REG_INT_ENABLE, /* for Gen2 */
RSND_REG_SRC_BUSIF_MODE,
RSND_REG_SRC_ROUTE_MODE0, RSND_REG_SRC_ROUTE_MODE0,
RSND_REG_SRC_SWRSR, RSND_REG_SRC_SWRSR,
RSND_REG_SRC_SRCIR, RSND_REG_SRC_SRCIR,

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

@ -211,7 +211,7 @@ static int rsnd_scu_convert_rate_ctrl(struct rsnd_priv *priv,
rsnd_mod_write(mod, SRC_SRCIR, 0); rsnd_mod_write(mod, SRC_SRCIR, 0);
/* use DMA transfer */ /* use DMA transfer */
rsnd_mod_write(mod, BUSIF_MODE, 1); rsnd_mod_write(mod, SRC_BUSIF_MODE, 1);
return 0; return 0;
} }