| From 239e78b54c84bc46741089b834f5b144a6d192fc Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 23 Jan 2014 18:37:39 -0800 |
| Subject: 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> |
| (cherry picked from commit 0290d2a42cb476358303d05fbe2475dd50889907) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/gen.c | 2 +- |
| sound/soc/sh/rcar/rsnd.h | 2 +- |
| 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) |
| 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_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_SWRSR, 0x200, 0x40), |
| 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 { |
| RSND_REG_SRC_ROUTE_CTRL, /* for Gen1 */ |
| RSND_REG_SSI_MODE0, |
| RSND_REG_SSI_MODE1, |
| - RSND_REG_BUSIF_MODE, |
| RSND_REG_INT_ENABLE, /* for Gen2 */ |
| + RSND_REG_SRC_BUSIF_MODE, |
| RSND_REG_SRC_ROUTE_MODE0, |
| RSND_REG_SRC_SWRSR, |
| 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, |
| rsnd_mod_write(mod, SRC_SRCIR, 0); |
| |
| /* use DMA transfer */ |
| - rsnd_mod_write(mod, BUSIF_MODE, 1); |
| + rsnd_mod_write(mod, SRC_BUSIF_MODE, 1); |
| |
| return 0; |
| } |
| -- |
| 2.1.2 |
| |