ASoC: rsnd: ssiu: Support BUSIF other than BUSIF0

Currently only BUSIF0 is supported by SSIU, all register setting
is done only for BUSIF.

Since BUSIF1 ~ BUSIF7 has been supported, so also support
these BUSIF from SSIU.

One note is that we can't support SSI9-4/5/6/7 so far,
because its address is out of calculation rule.

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
[Kuninori: tidyup for upstream]
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 0230301fe07801ab7f19bb6620451bb90ffaf747..3032869a7f269795877bc732c8134df0cafc3df9 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -219,9 +219,30 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
                RSND_GEN_S_REG(HDMI1_SEL,       0x9e4),
 
                /* FIXME: it needs SSI_MODE2/3 in the future */
-               RSND_GEN_M_REG(SSI_BUSIF_MODE,  0x0,    0x80),
-               RSND_GEN_M_REG(SSI_BUSIF_ADINR, 0x4,    0x80),
-               RSND_GEN_M_REG(SSI_BUSIF_DALIGN,0x8,    0x80),
+               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),

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index cb27a679dc65eec3a4531a03a14d5839ff45030d..7ff58b0e8002263f39085d6537bf08cabb5849c6 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -156,9 +156,30 @@ enum rsnd_reg {
        RSND_REG_SSI_MODE2,
        RSND_REG_SSI_CONTROL,
        RSND_REG_SSI_CTRL,
-       RSND_REG_SSI_BUSIF_MODE,
-       RSND_REG_SSI_BUSIF_ADINR,
-       RSND_REG_SSI_BUSIF_DALIGN,
+       RSND_REG_SSI_BUSIF0_MODE,
+       RSND_REG_SSI_BUSIF0_ADINR,
+       RSND_REG_SSI_BUSIF0_DALIGN,
+       RSND_REG_SSI_BUSIF1_MODE,
+       RSND_REG_SSI_BUSIF1_ADINR,
+       RSND_REG_SSI_BUSIF1_DALIGN,
+       RSND_REG_SSI_BUSIF2_MODE,
+       RSND_REG_SSI_BUSIF2_ADINR,
+       RSND_REG_SSI_BUSIF2_DALIGN,
+       RSND_REG_SSI_BUSIF3_MODE,
+       RSND_REG_SSI_BUSIF3_ADINR,
+       RSND_REG_SSI_BUSIF3_DALIGN,
+       RSND_REG_SSI_BUSIF4_MODE,
+       RSND_REG_SSI_BUSIF4_ADINR,
+       RSND_REG_SSI_BUSIF4_DALIGN,
+       RSND_REG_SSI_BUSIF5_MODE,
+       RSND_REG_SSI_BUSIF5_ADINR,
+       RSND_REG_SSI_BUSIF5_DALIGN,
+       RSND_REG_SSI_BUSIF6_MODE,
+       RSND_REG_SSI_BUSIF6_ADINR,
+       RSND_REG_SSI_BUSIF6_DALIGN,
+       RSND_REG_SSI_BUSIF7_MODE,
+       RSND_REG_SSI_BUSIF7_ADINR,
+       RSND_REG_SSI_BUSIF7_DALIGN,
        RSND_REG_SSI_INT_ENABLE,
        RSND_REG_SSI_SYS_STATUS0,
        RSND_REG_SSI_SYS_STATUS1,

diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 016fbf5ac242cc1137fa8957641ef5f50b886263..a9605a0163f2853610d82d014c452ad78fdec06a 100644 (file)
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -140,15 +140,59 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
        rsnd_mod_write(mod, SSI_MODE, mode);
 
        if (rsnd_ssi_use_busif(io)) {
-               rsnd_mod_write(mod, SSI_BUSIF_ADINR,
-                              rsnd_get_adinr_bit(mod, io) |
-                              (rsnd_io_is_play(io) ?
-                               rsnd_runtime_channel_after_ctu(io) :
-                               rsnd_runtime_channel_original(io)));
-               rsnd_mod_write(mod, SSI_BUSIF_MODE,
-                              rsnd_get_busif_shift(io, mod) | 1);
-               rsnd_mod_write(mod, SSI_BUSIF_DALIGN,
-                              rsnd_get_dalign(mod, io));
+               int id = rsnd_mod_id(mod);
+               int busif = rsnd_ssi_get_busif(io);
+
+               /*
+                * FIXME
+                *
+                * We can't support SSI9-4/5/6/7, because its address is
+                * out of calculation rule
+                */
+               if ((id == 9) && (busif >= 4)) {
+                       struct device *dev = rsnd_priv_to_dev(priv);
+
+                       dev_err(dev, "This driver doesn't support SSI%d-%d, so far",
+                               id, busif);
+               }
+
+#define RSND_WRITE_BUSIF(i)                                            \
+               rsnd_mod_write(mod, SSI_BUSIF##i##_ADINR,               \
+                              rsnd_get_adinr_bit(mod, io) |            \
+                              (rsnd_io_is_play(io) ?                   \
+                               rsnd_runtime_channel_after_ctu(io) :    \
+                               rsnd_runtime_channel_original(io)));    \
+               rsnd_mod_write(mod, SSI_BUSIF##i##_MODE,                \
+                              rsnd_get_busif_shift(io, mod) | 1);      \
+               rsnd_mod_write(mod, SSI_BUSIF##i##_DALIGN,              \
+                              rsnd_get_dalign(mod, io))
+
+               switch (busif) {
+               case 0:
+                       RSND_WRITE_BUSIF(0);
+                       break;
+               case 1:
+                       RSND_WRITE_BUSIF(1);
+                       break;
+               case 2:
+                       RSND_WRITE_BUSIF(2);
+                       break;
+               case 3:
+                       RSND_WRITE_BUSIF(3);
+                       break;
+               case 4:
+                       RSND_WRITE_BUSIF(4);
+                       break;
+               case 5:
+                       RSND_WRITE_BUSIF(5);
+                       break;
+               case 6:
+                       RSND_WRITE_BUSIF(6);
+                       break;
+               case 7:
+                       RSND_WRITE_BUSIF(7);
+                       break;
+               }
        }
 
        if (hdmi) {
@@ -194,10 +238,12 @@ static int rsnd_ssiu_start_gen2(struct rsnd_mod *mod,
                                struct rsnd_dai_stream *io,
                                struct rsnd_priv *priv)
 {
+       int busif = rsnd_ssi_get_busif(io);
+
        if (!rsnd_ssi_use_busif(io))
                return 0;
 
-       rsnd_mod_write(mod, SSI_CTRL, 0x1);
+       rsnd_mod_bset(mod, SSI_CTRL, 1 << (busif * 4), 1 << (busif * 4));
 
        if (rsnd_ssi_multi_slaves_runtime(io))
                rsnd_mod_write(mod, SSI_CONTROL, 0x1);
@@ -209,10 +255,12 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod,
                               struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
+       int busif = rsnd_ssi_get_busif(io);
+
        if (!rsnd_ssi_use_busif(io))
                return 0;
 
-       rsnd_mod_write(mod, SSI_CTRL, 0);
+       rsnd_mod_bset(mod, SSI_CTRL, 1 << (busif * 4), 0);
 
        if (rsnd_ssi_multi_slaves_runtime(io))
                rsnd_mod_write(mod, SSI_CONTROL, 0);