projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ae143f)
ASoC: rsnd: cleanup regmap table
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 2 Apr 2024 02:23:54 +0000 (02:23 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 2 Apr 2024 14:55:03 +0000 (15:55 +0100)
R-Car Sound is using almost same register mapping on each generation,
therefore we can share it. Here indicates some memo/comments.

SSI/SSIU/SCU have multi channels (SSI0 - SSI9 etc), but ADG is single,
so, we don't need to have multi channel settings for it

- rsnd_gen_regmap_init(..., 10, ..ADG, ...);
+ rsnd_gen_regmap_init(...,  1, ..ADG, ...);

Gen4 added new SSI_BUSIF, but it is not used

Gen4 calls rsnd_gen_regmap_init() for SDMC, but the address is calculated
by rsnd_gen4_dma_addr(). It needs physical address, but other info are
not needed. use NULL conf for it.

- rsnd_gen_regmap_init(..., 10, ..SDMC, conf_sdmc);
+ rsnd_gen_regmap_init(...,  1, ..SDMC, conf_null);

Gen4 have only SSI0/SSIU0, we don't need to have multi channel settings.

- rsnd_gen_regmap_init(..., 10, ..SSI, ...);
+ rsnd_gen_regmap_init(...,  1, ..SSI, ...);

SSI_MODE2 address is different between Gen2/3 and Gen4, but it is not
used on Gen4. Thus we can share same regmap table.

Gen2/3 : 0x808
Gen4   : 0xa0c

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Khanh Le <khanh.le.xr@renesas.com>
Link: https://msgid.link/r/871q7obiyt.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/gen.c patch | blob | history
sound/soc/sh/rcar/rsnd.h patch | blob | history

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 86bdecc24956b48626dd389aee206998eb3357e6..e566712e52346918ce36c7587f1663d9b6c660d6 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -215,70 +215,220 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
        return 0;
 }
 
+/*
+ * (A) : Gen4 is 0xa0c, but it is not used.
+ *     see
+ *             rsnd_ssiu_init()
+ */
+static const struct rsnd_regmap_field_conf conf_common_ssiu[] = {
+       RSND_GEN_S_REG(SSI_MODE0,               0x800),
+       RSND_GEN_S_REG(SSI_MODE1,               0x804),
+       RSND_GEN_S_REG(SSI_MODE2,               0x808), // (A)
+       RSND_GEN_S_REG(SSI_CONTROL,             0x810),
+       RSND_GEN_S_REG(SSI_SYS_STATUS0,         0x840),
+       RSND_GEN_S_REG(SSI_SYS_STATUS1,         0x844),
+       RSND_GEN_S_REG(SSI_SYS_STATUS2,         0x848),
+       RSND_GEN_S_REG(SSI_SYS_STATUS3,         0x84c),
+       RSND_GEN_S_REG(SSI_SYS_STATUS4,         0x880),
+       RSND_GEN_S_REG(SSI_SYS_STATUS5,         0x884),
+       RSND_GEN_S_REG(SSI_SYS_STATUS6,         0x888),
+       RSND_GEN_S_REG(SSI_SYS_STATUS7,         0x88c),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE0,     0x850),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE1,     0x854),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE2,     0x858),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE3,     0x85c),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE4,     0x890),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE5,     0x894),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE6,     0x898),
+       RSND_GEN_S_REG(SSI_SYS_INT_ENABLE7,     0x89c),
+       RSND_GEN_S_REG(HDMI0_SEL,               0x9e0),
+       RSND_GEN_S_REG(HDMI1_SEL,               0x9e4),
+       RSND_GEN_M_REG(SSI_BUSIF0_MODE,         0x0,    0x80),
+       RSND_GEN_M_REG(SSI_BUSIF0_ADINR,        0x4,    0x80),
+       RSND_GEN_M_REG(SSI_BUSIF0_DALIGN,       0x8,    0x80),
+       RSND_GEN_M_REG(SSI_BUSIF1_MODE,         0x20,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF1_ADINR,        0x24,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF1_DALIGN,       0x28,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF2_MODE,         0x40,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF2_ADINR,        0x44,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF2_DALIGN,       0x48,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF3_MODE,         0x60,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF3_ADINR,        0x64,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF3_DALIGN,       0x68,   0x80),
+       RSND_GEN_M_REG(SSI_BUSIF4_MODE,         0x500,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF4_ADINR,        0x504,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF4_DALIGN,       0x508,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF5_MODE,         0x520,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF5_ADINR,        0x524,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF5_DALIGN,       0x528,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF6_MODE,         0x540,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF6_ADINR,        0x544,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF6_DALIGN,       0x548,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF7_MODE,         0x560,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF7_ADINR,        0x564,  0x80),
+       RSND_GEN_M_REG(SSI_BUSIF7_DALIGN,       0x568,  0x80),
+       RSND_GEN_M_REG(SSI_MODE,                0xc,    0x80),
+       RSND_GEN_M_REG(SSI_CTRL,                0x10,   0x80),
+       RSND_GEN_M_REG(SSI_INT_ENABLE,          0x18,   0x80),
+       RSND_GEN_S_REG(SSI9_BUSIF0_MODE,        0x48c),
+       RSND_GEN_S_REG(SSI9_BUSIF0_ADINR,       0x484),
+       RSND_GEN_S_REG(SSI9_BUSIF0_DALIGN,      0x488),
+       RSND_GEN_S_REG(SSI9_BUSIF1_MODE,        0x4a0),
+       RSND_GEN_S_REG(SSI9_BUSIF1_ADINR,       0x4a4),
+       RSND_GEN_S_REG(SSI9_BUSIF1_DALIGN,      0x4a8),
+       RSND_GEN_S_REG(SSI9_BUSIF2_MODE,        0x4c0),
+       RSND_GEN_S_REG(SSI9_BUSIF2_ADINR,       0x4c4),
+       RSND_GEN_S_REG(SSI9_BUSIF2_DALIGN,      0x4c8),
+       RSND_GEN_S_REG(SSI9_BUSIF3_MODE,        0x4e0),
+       RSND_GEN_S_REG(SSI9_BUSIF3_ADINR,       0x4e4),
+       RSND_GEN_S_REG(SSI9_BUSIF3_DALIGN,      0x4e8),
+       RSND_GEN_S_REG(SSI9_BUSIF4_MODE,        0xd80),
+       RSND_GEN_S_REG(SSI9_BUSIF4_ADINR,       0xd84),
+       RSND_GEN_S_REG(SSI9_BUSIF4_DALIGN,      0xd88),
+       RSND_GEN_S_REG(SSI9_BUSIF5_MODE,        0xda0),
+       RSND_GEN_S_REG(SSI9_BUSIF5_ADINR,       0xda4),
+       RSND_GEN_S_REG(SSI9_BUSIF5_DALIGN,      0xda8),
+       RSND_GEN_S_REG(SSI9_BUSIF6_MODE,        0xdc0),
+       RSND_GEN_S_REG(SSI9_BUSIF6_ADINR,       0xdc4),
+       RSND_GEN_S_REG(SSI9_BUSIF6_DALIGN,      0xdc8),
+       RSND_GEN_S_REG(SSI9_BUSIF7_MODE,        0xde0),
+       RSND_GEN_S_REG(SSI9_BUSIF7_ADINR,       0xde4),
+       RSND_GEN_S_REG(SSI9_BUSIF7_DALIGN,      0xde8),
+};
+
+static const struct rsnd_regmap_field_conf conf_common_scu[] = {
+       RSND_GEN_M_REG(SRC_I_BUSIF_MODE,        0x0,    0x20),
+       RSND_GEN_M_REG(SRC_O_BUSIF_MODE,        0x4,    0x20),
+       RSND_GEN_M_REG(SRC_BUSIF_DALIGN,        0x8,    0x20),
+       RSND_GEN_M_REG(SRC_ROUTE_MODE0,         0xc,    0x20),
+       RSND_GEN_M_REG(SRC_CTRL,                0x10,   0x20),
+       RSND_GEN_M_REG(SRC_INT_ENABLE0,         0x18,   0x20),
+       RSND_GEN_M_REG(CMD_BUSIF_MODE,          0x184,  0x20),
+       RSND_GEN_M_REG(CMD_BUSIF_DALIGN,        0x188,  0x20),
+       RSND_GEN_M_REG(CMD_ROUTE_SLCT,          0x18c,  0x20),
+       RSND_GEN_M_REG(CMD_CTRL,                0x190,  0x20),
+       RSND_GEN_S_REG(SCU_SYS_STATUS0,         0x1c8),
+       RSND_GEN_S_REG(SCU_SYS_INT_EN0,         0x1cc),
+       RSND_GEN_S_REG(SCU_SYS_STATUS1,         0x1d0),
+       RSND_GEN_S_REG(SCU_SYS_INT_EN1,         0x1d4),
+       RSND_GEN_M_REG(SRC_SWRSR,               0x200,  0x40),
+       RSND_GEN_M_REG(SRC_SRCIR,               0x204,  0x40),
+       RSND_GEN_M_REG(SRC_ADINR,               0x214,  0x40),
+       RSND_GEN_M_REG(SRC_IFSCR,               0x21c,  0x40),
+       RSND_GEN_M_REG(SRC_IFSVR,               0x220,  0x40),
+       RSND_GEN_M_REG(SRC_SRCCR,               0x224,  0x40),
+       RSND_GEN_M_REG(SRC_BSDSR,               0x22c,  0x40),
+       RSND_GEN_M_REG(SRC_BSISR,               0x238,  0x40),
+       RSND_GEN_M_REG(CTU_SWRSR,               0x500,  0x100),
+       RSND_GEN_M_REG(CTU_CTUIR,               0x504,  0x100),
+       RSND_GEN_M_REG(CTU_ADINR,               0x508,  0x100),
+       RSND_GEN_M_REG(CTU_CPMDR,               0x510,  0x100),
+       RSND_GEN_M_REG(CTU_SCMDR,               0x514,  0x100),
+       RSND_GEN_M_REG(CTU_SV00R,               0x518,  0x100),
+       RSND_GEN_M_REG(CTU_SV01R,               0x51c,  0x100),
+       RSND_GEN_M_REG(CTU_SV02R,               0x520,  0x100),
+       RSND_GEN_M_REG(CTU_SV03R,               0x524,  0x100),
+       RSND_GEN_M_REG(CTU_SV04R,               0x528,  0x100),
+       RSND_GEN_M_REG(CTU_SV05R,               0x52c,  0x100),
+       RSND_GEN_M_REG(CTU_SV06R,               0x530,  0x100),
+       RSND_GEN_M_REG(CTU_SV07R,               0x534,  0x100),
+       RSND_GEN_M_REG(CTU_SV10R,               0x538,  0x100),
+       RSND_GEN_M_REG(CTU_SV11R,               0x53c,  0x100),
+       RSND_GEN_M_REG(CTU_SV12R,               0x540,  0x100),
+       RSND_GEN_M_REG(CTU_SV13R,               0x544,  0x100),
+       RSND_GEN_M_REG(CTU_SV14R,               0x548,  0x100),
+       RSND_GEN_M_REG(CTU_SV15R,               0x54c,  0x100),
+       RSND_GEN_M_REG(CTU_SV16R,               0x550,  0x100),
+       RSND_GEN_M_REG(CTU_SV17R,               0x554,  0x100),
+       RSND_GEN_M_REG(CTU_SV20R,               0x558,  0x100),
+       RSND_GEN_M_REG(CTU_SV21R,               0x55c,  0x100),
+       RSND_GEN_M_REG(CTU_SV22R,               0x560,  0x100),
+       RSND_GEN_M_REG(CTU_SV23R,               0x564,  0x100),
+       RSND_GEN_M_REG(CTU_SV24R,               0x568,  0x100),
+       RSND_GEN_M_REG(CTU_SV25R,               0x56c,  0x100),
+       RSND_GEN_M_REG(CTU_SV26R,               0x570,  0x100),
+       RSND_GEN_M_REG(CTU_SV27R,               0x574,  0x100),
+       RSND_GEN_M_REG(CTU_SV30R,               0x578,  0x100),
+       RSND_GEN_M_REG(CTU_SV31R,               0x57c,  0x100),
+       RSND_GEN_M_REG(CTU_SV32R,               0x580,  0x100),
+       RSND_GEN_M_REG(CTU_SV33R,               0x584,  0x100),
+       RSND_GEN_M_REG(CTU_SV34R,               0x588,  0x100),
+       RSND_GEN_M_REG(CTU_SV35R,               0x58c,  0x100),
+       RSND_GEN_M_REG(CTU_SV36R,               0x590,  0x100),
+       RSND_GEN_M_REG(CTU_SV37R,               0x594,  0x100),
+       RSND_GEN_M_REG(MIX_SWRSR,               0xd00,  0x40),
+       RSND_GEN_M_REG(MIX_MIXIR,               0xd04,  0x40),
+       RSND_GEN_M_REG(MIX_ADINR,               0xd08,  0x40),
+       RSND_GEN_M_REG(MIX_MIXMR,               0xd10,  0x40),
+       RSND_GEN_M_REG(MIX_MVPDR,               0xd14,  0x40),
+       RSND_GEN_M_REG(MIX_MDBAR,               0xd18,  0x40),
+       RSND_GEN_M_REG(MIX_MDBBR,               0xd1c,  0x40),
+       RSND_GEN_M_REG(MIX_MDBCR,               0xd20,  0x40),
+       RSND_GEN_M_REG(MIX_MDBDR,               0xd24,  0x40),
+       RSND_GEN_M_REG(MIX_MDBER,               0xd28,  0x40),
+       RSND_GEN_M_REG(DVC_SWRSR,               0xe00,  0x100),
+       RSND_GEN_M_REG(DVC_DVUIR,               0xe04,  0x100),
+       RSND_GEN_M_REG(DVC_ADINR,               0xe08,  0x100),
+       RSND_GEN_M_REG(DVC_DVUCR,               0xe10,  0x100),
+       RSND_GEN_M_REG(DVC_ZCMCR,               0xe14,  0x100),
+       RSND_GEN_M_REG(DVC_VRCTR,               0xe18,  0x100),
+       RSND_GEN_M_REG(DVC_VRPDR,               0xe1c,  0x100),
+       RSND_GEN_M_REG(DVC_VRDBR,               0xe20,  0x100),
+       RSND_GEN_M_REG(DVC_VOL0R,               0xe28,  0x100),
+       RSND_GEN_M_REG(DVC_VOL1R,               0xe2c,  0x100),
+       RSND_GEN_M_REG(DVC_VOL2R,               0xe30,  0x100),
+       RSND_GEN_M_REG(DVC_VOL3R,               0xe34,  0x100),
+       RSND_GEN_M_REG(DVC_VOL4R,               0xe38,  0x100),
+       RSND_GEN_M_REG(DVC_VOL5R,               0xe3c,  0x100),
+       RSND_GEN_M_REG(DVC_VOL6R,               0xe40,  0x100),
+       RSND_GEN_M_REG(DVC_VOL7R,               0xe44,  0x100),
+       RSND_GEN_M_REG(DVC_DVUER,               0xe48,  0x100),
+};
+
+static const struct rsnd_regmap_field_conf conf_common_adg[] = {
+       RSND_GEN_S_REG(BRRA,                    0x00),
+       RSND_GEN_S_REG(BRRB,                    0x04),
+       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),
+       RSND_GEN_S_REG(DIV_EN,                  0x30),
+       RSND_GEN_S_REG(SRCIN_TIMSEL0,           0x34),
+       RSND_GEN_S_REG(SRCIN_TIMSEL1,           0x38),
+       RSND_GEN_S_REG(SRCIN_TIMSEL2,           0x3c),
+       RSND_GEN_S_REG(SRCIN_TIMSEL3,           0x40),
+       RSND_GEN_S_REG(SRCIN_TIMSEL4,           0x44),
+       RSND_GEN_S_REG(SRCOUT_TIMSEL0,          0x48),
+       RSND_GEN_S_REG(SRCOUT_TIMSEL1,          0x4c),
+       RSND_GEN_S_REG(SRCOUT_TIMSEL2,          0x50),
+       RSND_GEN_S_REG(SRCOUT_TIMSEL3,          0x54),
+       RSND_GEN_S_REG(SRCOUT_TIMSEL4,          0x58),
+       RSND_GEN_S_REG(CMDOUT_TIMSEL,           0x5c),
+};
+
+static const struct rsnd_regmap_field_conf conf_common_ssi[] = {
+       RSND_GEN_M_REG(SSICR,                   0x00,   0x40),
+       RSND_GEN_M_REG(SSISR,                   0x04,   0x40),
+       RSND_GEN_M_REG(SSITDR,                  0x08,   0x40),
+       RSND_GEN_M_REG(SSIRDR,                  0x0c,   0x40),
+       RSND_GEN_M_REG(SSIWSR,                  0x20,   0x40),
+};
+
 /*
  *             Gen4
  */
 static int rsnd_gen4_probe(struct rsnd_priv *priv)
 {
-       static const struct rsnd_regmap_field_conf conf_ssiu[] = {
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE0,     0x850),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE2,     0x858),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE4,     0x890),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE6,     0x898),
-               RSND_GEN_S_REG(SSI_SYS_STATUS0,         0x840),
-               RSND_GEN_S_REG(SSI_SYS_STATUS2,         0x848),
-               RSND_GEN_S_REG(SSI_SYS_STATUS4,         0x880),
-               RSND_GEN_S_REG(SSI_SYS_STATUS6,         0x888),
-
-               RSND_GEN_S_REG(SSI_BUSIF0_MODE,         0x0),
-               RSND_GEN_S_REG(SSI_BUSIF0_ADINR,        0x4),
-               RSND_GEN_S_REG(SSI_BUSIF0_DALIGN,       0x8),
-               RSND_GEN_S_REG(SSI_BUSIF1_MODE,         0x20),
-               RSND_GEN_S_REG(SSI_BUSIF1_ADINR,        0x24),
-               RSND_GEN_S_REG(SSI_BUSIF1_DALIGN,       0x28),
-               RSND_GEN_S_REG(SSI_BUSIF2_MODE,         0x40),
-               RSND_GEN_S_REG(SSI_BUSIF2_ADINR,        0x44),
-               RSND_GEN_S_REG(SSI_BUSIF2_DALIGN,       0x48),
-               RSND_GEN_S_REG(SSI_BUSIF3_MODE,         0x60),
-               RSND_GEN_S_REG(SSI_BUSIF3_ADINR,        0x64),
-               RSND_GEN_S_REG(SSI_BUSIF3_DALIGN,       0x68),
-               RSND_GEN_S_REG(SSI_BUSIF4_MODE,         0x500),
-               RSND_GEN_S_REG(SSI_BUSIF4_ADINR,        0x504),
-               RSND_GEN_S_REG(SSI_BUSIF4_DALIGN,       0x508),
-               RSND_GEN_S_REG(SSI_BUSIF5_MODE,         0x520),
-               RSND_GEN_S_REG(SSI_BUSIF5_ADINR,        0x524),
-               RSND_GEN_S_REG(SSI_BUSIF5_DALIGN,       0x528),
-               RSND_GEN_S_REG(SSI_BUSIF6_MODE,         0x540),
-               RSND_GEN_S_REG(SSI_BUSIF6_ADINR,        0x544),
-               RSND_GEN_S_REG(SSI_BUSIF6_DALIGN,       0x548),
-               RSND_GEN_S_REG(SSI_BUSIF7_MODE,         0x560),
-               RSND_GEN_S_REG(SSI_BUSIF7_ADINR,        0x564),
-               RSND_GEN_S_REG(SSI_BUSIF7_DALIGN,       0x568),
-               RSND_GEN_S_REG(SSI_CTRL,                0x010),
-               RSND_GEN_S_REG(SSI_INT_ENABLE,          0x018),
-               RSND_GEN_S_REG(SSI_MODE,                0x00c),
-               RSND_GEN_S_REG(SSI_MODE2,               0xa0c),
-       };
-       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(BRGCKR,                  0x08),
-               RSND_GEN_S_REG(AUDIO_CLK_SEL0,          0x0c),
-       };
-       static const struct rsnd_regmap_field_conf conf_ssi[] = {
-               RSND_GEN_S_REG(SSICR,                   0x00),
-               RSND_GEN_S_REG(SSISR,                   0x04),
-               RSND_GEN_S_REG(SSITDR,                  0x08),
-               RSND_GEN_S_REG(SSIRDR,                  0x0c),
-               RSND_GEN_S_REG(SSIWSR,                  0x20),
-       };
-       static const struct rsnd_regmap_field_conf conf_sdmc[] = {
-               RSND_GEN_M_REG(SSI_BUSIF,               0x0, 0x8000),
-       };
-       int ret_adg  = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_ADG,  "adg",  conf_adg);
-       int ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SSIU, "ssiu", conf_ssiu);
-       int ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SSI,  "ssi",  conf_ssi);
-       int ret_sdmc = rsnd_gen_regmap_init(priv, 10, RSND_GEN4_SDMC, "sdmc", conf_sdmc);
+       struct rsnd_regmap_field_conf conf_null[] = { };
+
+       /*
+        * ssiu: SSIU0
+        * ssi : SSI0
+        */
+       int ret_ssiu = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SSIU, "ssiu", conf_common_ssiu);
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SSI,  "ssi",  conf_common_ssi);
+       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_ADG,  "adg",  conf_common_adg);
+       int ret_sdmc = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SDMC, "sdmc", conf_null);
 
        return ret_adg | ret_ssiu | ret_ssi | ret_sdmc;
 }
@@ -288,215 +438,17 @@ static int rsnd_gen4_probe(struct rsnd_priv *priv)
  */
 static int rsnd_gen2_probe(struct rsnd_priv *priv)
 {
-       static const struct rsnd_regmap_field_conf conf_ssiu[] = {
-               RSND_GEN_S_REG(SSI_MODE0,       0x800),
-               RSND_GEN_S_REG(SSI_MODE1,       0x804),
-               RSND_GEN_S_REG(SSI_MODE2,       0x808),
-               RSND_GEN_S_REG(SSI_CONTROL,     0x810),
-               RSND_GEN_S_REG(SSI_SYS_STATUS0, 0x840),
-               RSND_GEN_S_REG(SSI_SYS_STATUS1, 0x844),
-               RSND_GEN_S_REG(SSI_SYS_STATUS2, 0x848),
-               RSND_GEN_S_REG(SSI_SYS_STATUS3, 0x84c),
-               RSND_GEN_S_REG(SSI_SYS_STATUS4, 0x880),
-               RSND_GEN_S_REG(SSI_SYS_STATUS5, 0x884),
-               RSND_GEN_S_REG(SSI_SYS_STATUS6, 0x888),
-               RSND_GEN_S_REG(SSI_SYS_STATUS7, 0x88c),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE0, 0x850),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE1, 0x854),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE2, 0x858),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE3, 0x85c),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE4, 0x890),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE5, 0x894),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE6, 0x898),
-               RSND_GEN_S_REG(SSI_SYS_INT_ENABLE7, 0x89c),
-               RSND_GEN_S_REG(HDMI0_SEL,       0x9e0),
-               RSND_GEN_S_REG(HDMI1_SEL,       0x9e4),
-
-               /* FIXME: it needs SSI_MODE2/3 in the future */
-               RSND_GEN_M_REG(SSI_BUSIF0_MODE,         0x0,    0x80),
-               RSND_GEN_M_REG(SSI_BUSIF0_ADINR,        0x4,    0x80),
-               RSND_GEN_M_REG(SSI_BUSIF0_DALIGN,       0x8,    0x80),
-               RSND_GEN_M_REG(SSI_BUSIF1_MODE,         0x20,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF1_ADINR,        0x24,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF1_DALIGN,       0x28,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF2_MODE,         0x40,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF2_ADINR,        0x44,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF2_DALIGN,       0x48,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF3_MODE,         0x60,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF3_ADINR,        0x64,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF3_DALIGN,       0x68,   0x80),
-               RSND_GEN_M_REG(SSI_BUSIF4_MODE,         0x500,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF4_ADINR,        0x504,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF4_DALIGN,       0x508,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF5_MODE,         0x520,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF5_ADINR,        0x524,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF5_DALIGN,       0x528,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF6_MODE,         0x540,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF6_ADINR,        0x544,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF6_DALIGN,       0x548,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF7_MODE,         0x560,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF7_ADINR,        0x564,  0x80),
-               RSND_GEN_M_REG(SSI_BUSIF7_DALIGN,       0x568,  0x80),
-               RSND_GEN_M_REG(SSI_MODE,                0xc,    0x80),
-               RSND_GEN_M_REG(SSI_CTRL,                0x10,   0x80),
-               RSND_GEN_M_REG(SSI_INT_ENABLE,          0x18,   0x80),
-               RSND_GEN_S_REG(SSI9_BUSIF0_MODE,        0x48c),
-               RSND_GEN_S_REG(SSI9_BUSIF0_ADINR,       0x484),
-               RSND_GEN_S_REG(SSI9_BUSIF0_DALIGN,      0x488),
-               RSND_GEN_S_REG(SSI9_BUSIF1_MODE,        0x4a0),
-               RSND_GEN_S_REG(SSI9_BUSIF1_ADINR,       0x4a4),
-               RSND_GEN_S_REG(SSI9_BUSIF1_DALIGN,      0x4a8),
-               RSND_GEN_S_REG(SSI9_BUSIF2_MODE,        0x4c0),
-               RSND_GEN_S_REG(SSI9_BUSIF2_ADINR,       0x4c4),
-               RSND_GEN_S_REG(SSI9_BUSIF2_DALIGN,      0x4c8),
-               RSND_GEN_S_REG(SSI9_BUSIF3_MODE,        0x4e0),
-               RSND_GEN_S_REG(SSI9_BUSIF3_ADINR,       0x4e4),
-               RSND_GEN_S_REG(SSI9_BUSIF3_DALIGN,      0x4e8),
-               RSND_GEN_S_REG(SSI9_BUSIF4_MODE,        0xd80),
-               RSND_GEN_S_REG(SSI9_BUSIF4_ADINR,       0xd84),
-               RSND_GEN_S_REG(SSI9_BUSIF4_DALIGN,      0xd88),
-               RSND_GEN_S_REG(SSI9_BUSIF5_MODE,        0xda0),
-               RSND_GEN_S_REG(SSI9_BUSIF5_ADINR,       0xda4),
-               RSND_GEN_S_REG(SSI9_BUSIF5_DALIGN,      0xda8),
-               RSND_GEN_S_REG(SSI9_BUSIF6_MODE,        0xdc0),
-               RSND_GEN_S_REG(SSI9_BUSIF6_ADINR,       0xdc4),
-               RSND_GEN_S_REG(SSI9_BUSIF6_DALIGN,      0xdc8),
-               RSND_GEN_S_REG(SSI9_BUSIF7_MODE,        0xde0),
-               RSND_GEN_S_REG(SSI9_BUSIF7_ADINR,       0xde4),
-               RSND_GEN_S_REG(SSI9_BUSIF7_DALIGN,      0xde8),
-       };
-
-       static const struct rsnd_regmap_field_conf conf_scu[] = {
-               RSND_GEN_M_REG(SRC_I_BUSIF_MODE,0x0,    0x20),
-               RSND_GEN_M_REG(SRC_O_BUSIF_MODE,0x4,    0x20),
-               RSND_GEN_M_REG(SRC_BUSIF_DALIGN,0x8,    0x20),
-               RSND_GEN_M_REG(SRC_ROUTE_MODE0, 0xc,    0x20),
-               RSND_GEN_M_REG(SRC_CTRL,        0x10,   0x20),
-               RSND_GEN_M_REG(SRC_INT_ENABLE0, 0x18,   0x20),
-               RSND_GEN_M_REG(CMD_BUSIF_MODE,  0x184,  0x20),
-               RSND_GEN_M_REG(CMD_BUSIF_DALIGN,0x188,  0x20),
-               RSND_GEN_M_REG(CMD_ROUTE_SLCT,  0x18c,  0x20),
-               RSND_GEN_M_REG(CMD_CTRL,        0x190,  0x20),
-               RSND_GEN_S_REG(SCU_SYS_STATUS0, 0x1c8),
-               RSND_GEN_S_REG(SCU_SYS_INT_EN0, 0x1cc),
-               RSND_GEN_S_REG(SCU_SYS_STATUS1, 0x1d0),
-               RSND_GEN_S_REG(SCU_SYS_INT_EN1, 0x1d4),
-               RSND_GEN_M_REG(SRC_SWRSR,       0x200,  0x40),
-               RSND_GEN_M_REG(SRC_SRCIR,       0x204,  0x40),
-               RSND_GEN_M_REG(SRC_ADINR,       0x214,  0x40),
-               RSND_GEN_M_REG(SRC_IFSCR,       0x21c,  0x40),
-               RSND_GEN_M_REG(SRC_IFSVR,       0x220,  0x40),
-               RSND_GEN_M_REG(SRC_SRCCR,       0x224,  0x40),
-               RSND_GEN_M_REG(SRC_BSDSR,       0x22c,  0x40),
-               RSND_GEN_M_REG(SRC_BSISR,       0x238,  0x40),
-               RSND_GEN_M_REG(CTU_SWRSR,       0x500,  0x100),
-               RSND_GEN_M_REG(CTU_CTUIR,       0x504,  0x100),
-               RSND_GEN_M_REG(CTU_ADINR,       0x508,  0x100),
-               RSND_GEN_M_REG(CTU_CPMDR,       0x510,  0x100),
-               RSND_GEN_M_REG(CTU_SCMDR,       0x514,  0x100),
-               RSND_GEN_M_REG(CTU_SV00R,       0x518,  0x100),
-               RSND_GEN_M_REG(CTU_SV01R,       0x51c,  0x100),
-               RSND_GEN_M_REG(CTU_SV02R,       0x520,  0x100),
-               RSND_GEN_M_REG(CTU_SV03R,       0x524,  0x100),
-               RSND_GEN_M_REG(CTU_SV04R,       0x528,  0x100),
-               RSND_GEN_M_REG(CTU_SV05R,       0x52c,  0x100),
-               RSND_GEN_M_REG(CTU_SV06R,       0x530,  0x100),
-               RSND_GEN_M_REG(CTU_SV07R,       0x534,  0x100),
-               RSND_GEN_M_REG(CTU_SV10R,       0x538,  0x100),
-               RSND_GEN_M_REG(CTU_SV11R,       0x53c,  0x100),
-               RSND_GEN_M_REG(CTU_SV12R,       0x540,  0x100),
-               RSND_GEN_M_REG(CTU_SV13R,       0x544,  0x100),
-               RSND_GEN_M_REG(CTU_SV14R,       0x548,  0x100),
-               RSND_GEN_M_REG(CTU_SV15R,       0x54c,  0x100),
-               RSND_GEN_M_REG(CTU_SV16R,       0x550,  0x100),
-               RSND_GEN_M_REG(CTU_SV17R,       0x554,  0x100),
-               RSND_GEN_M_REG(CTU_SV20R,       0x558,  0x100),
-               RSND_GEN_M_REG(CTU_SV21R,       0x55c,  0x100),
-               RSND_GEN_M_REG(CTU_SV22R,       0x560,  0x100),
-               RSND_GEN_M_REG(CTU_SV23R,       0x564,  0x100),
-               RSND_GEN_M_REG(CTU_SV24R,       0x568,  0x100),
-               RSND_GEN_M_REG(CTU_SV25R,       0x56c,  0x100),
-               RSND_GEN_M_REG(CTU_SV26R,       0x570,  0x100),
-               RSND_GEN_M_REG(CTU_SV27R,       0x574,  0x100),
-               RSND_GEN_M_REG(CTU_SV30R,       0x578,  0x100),
-               RSND_GEN_M_REG(CTU_SV31R,       0x57c,  0x100),
-               RSND_GEN_M_REG(CTU_SV32R,       0x580,  0x100),
-               RSND_GEN_M_REG(CTU_SV33R,       0x584,  0x100),
-               RSND_GEN_M_REG(CTU_SV34R,       0x588,  0x100),
-               RSND_GEN_M_REG(CTU_SV35R,       0x58c,  0x100),
-               RSND_GEN_M_REG(CTU_SV36R,       0x590,  0x100),
-               RSND_GEN_M_REG(CTU_SV37R,       0x594,  0x100),
-               RSND_GEN_M_REG(MIX_SWRSR,       0xd00,  0x40),
-               RSND_GEN_M_REG(MIX_MIXIR,       0xd04,  0x40),
-               RSND_GEN_M_REG(MIX_ADINR,       0xd08,  0x40),
-               RSND_GEN_M_REG(MIX_MIXMR,       0xd10,  0x40),
-               RSND_GEN_M_REG(MIX_MVPDR,       0xd14,  0x40),
-               RSND_GEN_M_REG(MIX_MDBAR,       0xd18,  0x40),
-               RSND_GEN_M_REG(MIX_MDBBR,       0xd1c,  0x40),
-               RSND_GEN_M_REG(MIX_MDBCR,       0xd20,  0x40),
-               RSND_GEN_M_REG(MIX_MDBDR,       0xd24,  0x40),
-               RSND_GEN_M_REG(MIX_MDBER,       0xd28,  0x40),
-               RSND_GEN_M_REG(DVC_SWRSR,       0xe00,  0x100),
-               RSND_GEN_M_REG(DVC_DVUIR,       0xe04,  0x100),
-               RSND_GEN_M_REG(DVC_ADINR,       0xe08,  0x100),
-               RSND_GEN_M_REG(DVC_DVUCR,       0xe10,  0x100),
-               RSND_GEN_M_REG(DVC_ZCMCR,       0xe14,  0x100),
-               RSND_GEN_M_REG(DVC_VRCTR,       0xe18,  0x100),
-               RSND_GEN_M_REG(DVC_VRPDR,       0xe1c,  0x100),
-               RSND_GEN_M_REG(DVC_VRDBR,       0xe20,  0x100),
-               RSND_GEN_M_REG(DVC_VOL0R,       0xe28,  0x100),
-               RSND_GEN_M_REG(DVC_VOL1R,       0xe2c,  0x100),
-               RSND_GEN_M_REG(DVC_VOL2R,       0xe30,  0x100),
-               RSND_GEN_M_REG(DVC_VOL3R,       0xe34,  0x100),
-               RSND_GEN_M_REG(DVC_VOL4R,       0xe38,  0x100),
-               RSND_GEN_M_REG(DVC_VOL5R,       0xe3c,  0x100),
-               RSND_GEN_M_REG(DVC_VOL6R,       0xe40,  0x100),
-               RSND_GEN_M_REG(DVC_VOL7R,       0xe44,  0x100),
-               RSND_GEN_M_REG(DVC_DVUER,       0xe48,  0x100),
-       };
-       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(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),
-               RSND_GEN_S_REG(DIV_EN,          0x30),
-               RSND_GEN_S_REG(SRCIN_TIMSEL0,   0x34),
-               RSND_GEN_S_REG(SRCIN_TIMSEL1,   0x38),
-               RSND_GEN_S_REG(SRCIN_TIMSEL2,   0x3c),
-               RSND_GEN_S_REG(SRCIN_TIMSEL3,   0x40),
-               RSND_GEN_S_REG(SRCIN_TIMSEL4,   0x44),
-               RSND_GEN_S_REG(SRCOUT_TIMSEL0,  0x48),
-               RSND_GEN_S_REG(SRCOUT_TIMSEL1,  0x4c),
-               RSND_GEN_S_REG(SRCOUT_TIMSEL2,  0x50),
-               RSND_GEN_S_REG(SRCOUT_TIMSEL3,  0x54),
-               RSND_GEN_S_REG(SRCOUT_TIMSEL4,  0x58),
-               RSND_GEN_S_REG(CMDOUT_TIMSEL,   0x5c),
-       };
-       static const struct rsnd_regmap_field_conf conf_ssi[] = {
-               RSND_GEN_M_REG(SSICR,           0x00,   0x40),
-               RSND_GEN_M_REG(SSISR,           0x04,   0x40),
-               RSND_GEN_M_REG(SSITDR,          0x08,   0x40),
-               RSND_GEN_M_REG(SSIRDR,          0x0c,   0x40),
-               RSND_GEN_M_REG(SSIWSR,          0x20,   0x40),
-       };
-       int ret_ssiu;
-       int ret_scu;
-       int ret_adg;
-       int ret_ssi;
-
-       ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSIU, "ssiu", conf_ssiu);
-       ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SCU,  "scu",  conf_scu);
-       ret_adg  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_ADG,  "adg",  conf_adg);
-       ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSI,  "ssi",  conf_ssi);
-       if (ret_ssiu < 0 ||
-           ret_scu  < 0 ||
-           ret_adg  < 0 ||
-           ret_ssi  < 0)
-               return ret_ssiu | ret_scu | ret_adg | ret_ssi;
-
-       return 0;
+       /*
+        * ssi : SSI0  - SSI9
+        * ssiu: SSIU0 - SSIU9
+        * scu : SRC0  - SRC9 etc
+        */
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSI,  "ssi",  conf_common_ssi);
+       int ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSIU, "ssiu", conf_common_ssiu);
+       int ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SCU,  "scu",  conf_common_scu);
+       int ret_adg  = rsnd_gen_regmap_init(priv,  1, RSND_GEN2_ADG,  "adg",  conf_common_adg);
+
+       return ret_ssi | ret_ssiu | ret_scu | ret_adg;
 }
 
 /*
@@ -505,30 +457,13 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
 
 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(BRGCKR,          0x08),
-               RSND_GEN_S_REG(AUDIO_CLK_SEL0,  0x0c),
-               RSND_GEN_S_REG(AUDIO_CLK_SEL1,  0x10),
-       };
-       static const struct rsnd_regmap_field_conf conf_ssi[] = {
-               RSND_GEN_M_REG(SSICR,           0x00,   0x40),
-               RSND_GEN_M_REG(SSISR,           0x04,   0x40),
-               RSND_GEN_M_REG(SSITDR,          0x08,   0x40),
-               RSND_GEN_M_REG(SSIRDR,          0x0c,   0x40),
-               RSND_GEN_M_REG(SSIWSR,          0x20,   0x40),
-       };
-       int ret_adg;
-       int ret_ssi;
-
-       ret_adg  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_ADG, "adg", conf_adg);
-       ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SSI, "ssi", conf_ssi);
-       if (ret_adg  < 0 ||
-           ret_ssi  < 0)
-               return ret_adg | ret_ssi;
+       /*
+        * ssi : SSI0 - SSI8
+        */
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SSI, "ssi", conf_common_ssi);
+       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_GEN1_ADG, "adg", conf_common_adg);
 
-       return 0;
+       return ret_adg | ret_ssi;
 }
 
 /*
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index da716b1f52e48b2d01567864af119a22f9d6228b..e063286cc32875bcc5bb9160d1c3c75171479ac8 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -200,7 +200,6 @@ enum rsnd_reg {
        SSI_SYS_INT_ENABLE5,
        SSI_SYS_INT_ENABLE6,
        SSI_SYS_INT_ENABLE7,
-       SSI_BUSIF,
        HDMI0_SEL,
        HDMI1_SEL,
        SSI9_BUSIF0_MODE,
ep93xx device tree rework repo: git://git.maquefel.me/linux.git