ASoC: rsnd: use BRGCKR instead of SSICKR

Current register name of "SSICKR" was came from R-Car Gen1
which is very old style. It is called as "BRGCKR" on R-Car Gen2/Gen3.
Let's rename it

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

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 2145957d02290f4e61b97fdf01b01b4716b7f0b6..545377dc15edc75526ff7352f2d865d34e602ec4 100644 (file)
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -366,7 +366,7 @@ found_clock:
                if (0 == (rate % 8000))
                        ckr = 0x80000000;
 
-               rsnd_mod_bset(adg_mod, SSICKR, 0x80000000, ckr);
+               rsnd_mod_bset(adg_mod, BRGCKR, 0x80000000, ckr);
        }
 
        dev_dbg(dev, "ADG: %s[%d] selects 0x%x for %d\n",
@@ -532,13 +532,13 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
                }
        }
 
-       rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);
+       rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF0000, ckr);
        rsnd_mod_write(adg_mod, BRRA,  rbga);
        rsnd_mod_write(adg_mod, BRRB,  rbgb);
 
        for_each_rsnd_clkout(clk, adg, i)
                dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk));
-       dev_dbg(dev, "SSICKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
+       dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
                ckr, rbga, rbgb);
 }
 

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index d653cf488f7368a8c93d9078d4a222cb46c05f37..63b6d3c28021024b1f06278c5c4f217a394faf8c 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -319,7 +319,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
        static const struct rsnd_regmap_field_conf conf_adg[] = {
                RSND_GEN_S_REG(BRRA,            0x00),
                RSND_GEN_S_REG(BRRB,            0x04),
-               RSND_GEN_S_REG(SSICKR,          0x08),
+               RSND_GEN_S_REG(BRGCKR,          0x08),
                RSND_GEN_S_REG(AUDIO_CLK_SEL0,  0x0c),
                RSND_GEN_S_REG(AUDIO_CLK_SEL1,  0x10),
                RSND_GEN_S_REG(AUDIO_CLK_SEL2,  0x14),
@@ -370,7 +370,7 @@ static int rsnd_gen1_probe(struct rsnd_priv *priv)
        static const struct rsnd_regmap_field_conf conf_adg[] = {
                RSND_GEN_S_REG(BRRA,            0x00),
                RSND_GEN_S_REG(BRRB,            0x04),
-               RSND_GEN_S_REG(SSICKR,          0x08),
+               RSND_GEN_S_REG(BRGCKR,          0x08),
                RSND_GEN_S_REG(AUDIO_CLK_SEL0,  0x0c),
                RSND_GEN_S_REG(AUDIO_CLK_SEL1,  0x10),
        };

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index d6bb53009123afc8622e9691ff99ffdb8f502af4..d9e550211c092ecd9cadfbe9390a76f8d6b9691e 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -144,7 +144,7 @@ enum rsnd_reg {
        /* ADG */
        RSND_REG_BRRA,
        RSND_REG_BRRB,
-       RSND_REG_SSICKR,
+       RSND_REG_BRGCKR,
        RSND_REG_DIV_EN,
        RSND_REG_AUDIO_CLK_SEL0,
        RSND_REG_AUDIO_CLK_SEL1,