ASoC: rsnd: add RSND_GEN3 for R-Car Gen3

rsnd driver is supporting Gen3. The difference between Gen1 and Gen2
were very big, but, between Gen2 and Gen3 are not so much.
Thus, it is assuming Gen2 and Gen3 have compatible, therefore,
there is no RSND_GEN3 and rsnd_is_gen3() macro.
But in the future, it will need Gen2 and Gen3 different operation,
and for Gen4.
This patch adds missing RSND_GEN3 and rsnd_is_gen3() macro.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Nguyen Viet Dung <dung.nguyen.aj@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 6a76688a8ba953d5b8f373e6a382c8437ec7bfa6..47a55d6bfd8029bf93898acab993a996534c438d 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -111,7 +111,7 @@
 static const struct of_device_id rsnd_of_match[] = {
        { .compatible = "renesas,rcar_sound-gen1", .data = (void *)RSND_GEN1 },
        { .compatible = "renesas,rcar_sound-gen2", .data = (void *)RSND_GEN2 },
-       { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN2 }, /* gen2 compatible */
+       { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN3 },
        {},
 };
 MODULE_DEVICE_TABLE(of, rsnd_of_match);

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 41de23417c4a11199140f32c8b7804c51e606a24..32ac97be26f1b6165b83f8e4bb5afb7e1c98d90d 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -695,7 +695,7 @@ static int rsnd_dma_alloc(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
 
        rsnd_dma_of_path(mod, io, is_play, &mod_from, &mod_to);
 
-       /* for Gen2 */
+       /* for Gen2 or later */
        if (mod_from && mod_to) {
                ops     = &rsnd_dmapp_ops;
                attach  = rsnd_dmapp_attach;
@@ -773,7 +773,7 @@ int rsnd_dma_probe(struct rsnd_priv *priv)
                return 0;
 
        /*
-        * for Gen2
+        * for Gen2 or later
         */
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp");
        dmac = devm_kzalloc(dev, sizeof(*dmac), GFP_KERNEL);

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index f04c4100043a11f39c68d55bca3c99f8dca6ea04..25642e92dae0681131932838001097c8fe1fc46e 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -414,7 +414,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv)
        ret = -ENODEV;
        if (rsnd_is_gen1(priv))
                ret = rsnd_gen1_probe(priv);
-       else if (rsnd_is_gen2(priv))
+       else if (rsnd_is_gen2(priv) ||
+                rsnd_is_gen3(priv))
                ret = rsnd_gen2_probe(priv);
 
        if (ret < 0)

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index ab4d55548ed12952b70cb8536edaf6faa95db585..b1896f1eb2146f923787911a305d457b5320e9f1 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -538,6 +538,7 @@ struct rsnd_priv {
 #define RSND_GEN_MASK  (0xF << 0)
 #define RSND_GEN1      (1 << 0)
 #define RSND_GEN2      (2 << 0)
+#define RSND_GEN3      (3 << 0)
 
        /*
         * below value will be filled on rsnd_gen_probe()
@@ -609,6 +610,7 @@ struct rsnd_priv {
 
 #define rsnd_is_gen1(priv)     (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1)
 #define rsnd_is_gen2(priv)     (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2)
+#define rsnd_is_gen3(priv)     (((priv)->flags & RSND_GEN_MASK) == RSND_GEN3)
 
 #define rsnd_flags_has(p, f) ((p)->flags & (f))
 #define rsnd_flags_set(p, f) ((p)->flags |= (f))