diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-01-23 21:37:39 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-03 07:41:15 -0500 |
commit | 0290d2a42cb476358303d05fbe2475dd50889907 (patch) | |
tree | f8426f216c4cfed3c3d19419d070862ca6482ec6 | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
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>
-rw-r--r-- | sound/soc/sh/rcar/gen.c | 2 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 2 | ||||
-rw-r--r-- | sound/soc/sh/rcar/scu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index add088bd4b2a..cbdbbfa322b8 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c | |||
@@ -317,7 +317,7 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen) | |||
317 | RSND_GEN1_S_REG(gen, SRU, SRC_ROUTE_CTRL, 0xc0), | 317 | RSND_GEN1_S_REG(gen, SRU, SRC_ROUTE_CTRL, 0xc0), |
318 | RSND_GEN1_S_REG(gen, SRU, SSI_MODE0, 0xD0), | 318 | RSND_GEN1_S_REG(gen, SRU, SSI_MODE0, 0xD0), |
319 | RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4), | 319 | RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4), |
320 | RSND_GEN1_M_REG(gen, SRU, BUSIF_MODE, 0x20, 0x4), | 320 | RSND_GEN1_M_REG(gen, SRU, SRC_BUSIF_MODE, 0x20, 0x4), |
321 | RSND_GEN1_M_REG(gen, SRU, SRC_ROUTE_MODE0,0x50, 0x8), | 321 | RSND_GEN1_M_REG(gen, SRU, SRC_ROUTE_MODE0,0x50, 0x8), |
322 | RSND_GEN1_M_REG(gen, SRU, SRC_SWRSR, 0x200, 0x40), | 322 | RSND_GEN1_M_REG(gen, SRU, SRC_SWRSR, 0x200, 0x40), |
323 | RSND_GEN1_M_REG(gen, SRU, SRC_SRCIR, 0x204, 0x40), | 323 | RSND_GEN1_M_REG(gen, SRU, SRC_SRCIR, 0x204, 0x40), |
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 4ca66cd899c8..f62b9eb274e1 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -39,8 +39,8 @@ enum rsnd_reg { | |||
39 | RSND_REG_SRC_ROUTE_CTRL, /* for Gen1 */ | 39 | RSND_REG_SRC_ROUTE_CTRL, /* for Gen1 */ |
40 | RSND_REG_SSI_MODE0, | 40 | RSND_REG_SSI_MODE0, |
41 | RSND_REG_SSI_MODE1, | 41 | RSND_REG_SSI_MODE1, |
42 | RSND_REG_BUSIF_MODE, | ||
43 | RSND_REG_INT_ENABLE, /* for Gen2 */ | 42 | RSND_REG_INT_ENABLE, /* for Gen2 */ |
43 | RSND_REG_SRC_BUSIF_MODE, | ||
44 | RSND_REG_SRC_ROUTE_MODE0, | 44 | RSND_REG_SRC_ROUTE_MODE0, |
45 | RSND_REG_SRC_SWRSR, | 45 | RSND_REG_SRC_SWRSR, |
46 | RSND_REG_SRC_SRCIR, | 46 | RSND_REG_SRC_SRCIR, |
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c index 9bb08bb1d455..9b9daa3821a3 100644 --- a/sound/soc/sh/rcar/scu.c +++ b/sound/soc/sh/rcar/scu.c | |||
@@ -211,7 +211,7 @@ static int rsnd_scu_convert_rate_ctrl(struct rsnd_priv *priv, | |||
211 | rsnd_mod_write(mod, SRC_SRCIR, 0); | 211 | rsnd_mod_write(mod, SRC_SRCIR, 0); |
212 | 212 | ||
213 | /* use DMA transfer */ | 213 | /* use DMA transfer */ |
214 | rsnd_mod_write(mod, BUSIF_MODE, 1); | 214 | rsnd_mod_write(mod, SRC_BUSIF_MODE, 1); |
215 | 215 | ||
216 | return 0; | 216 | return 0; |
217 | } | 217 | } |