ASoC: rsnd: tidyup register naming

Use correct register name which appears in the datasheet

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index d0ab203836de3d78679f181f44b23b2f0ebdae36..862758d3ec063023d3943d4c66ac8813936a9573 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -314,11 +314,11 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL0,   0x08),
                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL1,   0x0c),
                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL2,   0x10),
-               RSND_GEN1_S_REG(gen, SRU,       SRC_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_MODE1,      0xD4),
                RSND_GEN1_M_REG(gen, SRU,       BUSIF_MODE,     0x20,   0x4),
-               RSND_GEN1_M_REG(gen, SRU,       BUSIF_ADINR,    0x214,  0x40),
+               RSND_GEN1_M_REG(gen, SRU,       SRC_ADINR,      0x214,  0x40),
 
                RSND_GEN1_S_REG(gen, ADG,       BRRA,           0x00),
                RSND_GEN1_S_REG(gen, ADG,       BRRB,           0x04),

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index bff7b9e5306656a55e6686142f4602be5c859b8a..d5c0182c8e5063f4b99f8b3ff50cc2149da7b50f 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -36,12 +36,12 @@ enum rsnd_reg {
        RSND_REG_SRC_TMG_SEL0,
        RSND_REG_SRC_TMG_SEL1,
        RSND_REG_SRC_TMG_SEL2,
-       RSND_REG_SRC_CTRL,
+       RSND_REG_SRC_ROUTE_CTRL,
        RSND_REG_SSI_MODE0,
        RSND_REG_SSI_MODE1,
        RSND_REG_BUSIF_MODE,
-       RSND_REG_BUSIF_ADINR,
        RSND_REG_INT_ENABLE,
+       RSND_REG_SRC_ADINR,
 
        /* ADG */
        RSND_REG_BRRA,

diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 1ab1bce6be7f644affa15b4855b3f2f398d125d9..187f7dc30369e7c9d2076e6b64c8ec68a8863c86 100644 (file)
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -115,7 +115,7 @@ static int rsnd_scu_set_mode(struct rsnd_priv *priv,
 
        if (rsnd_is_gen1(priv)) {
                val = (1 << id);
-               rsnd_mod_bset(mod, SRC_CTRL, val, val);
+               rsnd_mod_bset(mod, SRC_ROUTE_CTRL, val, val);
        }
 
        return 0;
@@ -141,7 +141,7 @@ static int rsnd_scu_set_hpbif(struct rsnd_priv *priv,
        }
 
        rsnd_mod_write(mod, BUSIF_MODE, 1);
-       rsnd_mod_write(mod, BUSIF_ADINR, adinr);
+       rsnd_mod_write(mod, SRC_ADINR, adinr);
 
        return 0;
 }