ASoC: soc-core: use snd_soc_dai_link_component for platform

Current struct snd_soc_dai_link is supporting multicodec,
and it is supporting legacy style of
	codec_name
	codec_of_node
	code_dai_name
This is handled as single entry of multicodec.

We don't have multicpu support yet, but in the future we will.
In such case, we can use snd_soc_dai_link_component for both
cpu/codec. Then the code will be more simple and readble.

As next step, we want to use it for platform, too.
This patch adds snd_soc_dai_link_component style for platform.
We might have multiplatform support in the future, but we
don't know yet. To avoid un-known issue / complex code,
this patch supports just single-platform as 1st step.

If we could use snd_soc_dai_link_component for all CPU/Codec/Platform,
we will switch to new style, and remove legacy code.
This is prepare for it.

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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 41cec42fb456a5013a007036a11c7b542c84a50e..96c19aabf21b82e55ebe9701c8da8c14ffb47fe0 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -915,6 +915,8 @@ struct snd_soc_dai_link {
         */
        const char *platform_name;
        struct device_node *platform_of_node;
+       struct snd_soc_dai_link_component *platform;
+
        int id; /* optional ID for machine driver link identification */
 
        const struct snd_soc_pcm_stream *params;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 473eefe8658e9a22af71b2f3af42f1f92cf00acd..2a73630d06804a77b26fd4ded29198ab2807eb29 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -892,8 +892,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
        rtd->codec_dai = codec_dais[0];
 
        /* if there's no platform we match on the empty platform */
-       platform_name = dai_link->platform_name;
-       if (!platform_name && !dai_link->platform_of_node)
+       platform_name = dai_link->platform->name;
+       if (!platform_name && !dai_link->platform->of_node)
                platform_name = "snd-soc-dummy";
 
        /* find one from the set of registered platforms */
@@ -902,8 +902,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
                if (!platform_of_node && component->dev->parent->of_node)
                        platform_of_node = component->dev->parent->of_node;
 
-               if (dai_link->platform_of_node) {
-                       if (platform_of_node != dai_link->platform_of_node)
+               if (dai_link->platform->of_node) {
+                       if (platform_of_node != dai_link->platform->of_node)
                                continue;
                } else {
                        if (strcmp(component->name, platform_name))
@@ -1015,6 +1015,31 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
        }
 }
 
+static int snd_soc_init_platform(struct snd_soc_card *card,
+                                struct snd_soc_dai_link *dai_link)
+{
+       /*
+        * FIXME
+        *
+        * this function should be removed in the future
+        */
+       /* convert Legacy platform link */
+       if (dai_link->platform)
+               return 0;
+
+       dai_link->platform = devm_kzalloc(card->dev,
+                               sizeof(struct snd_soc_dai_link_component),
+                               GFP_KERNEL);
+       if (!dai_link->platform)
+               return -ENOMEM;
+
+       dai_link->platform->name        = dai_link->platform_name;
+       dai_link->platform->of_node     = dai_link->platform_of_node;
+       dai_link->platform->dai_name    = NULL;
+
+       return 0;
+}
+
 static int snd_soc_init_multicodec(struct snd_soc_card *card,
                                   struct snd_soc_dai_link *dai_link)
 {
@@ -1047,6 +1072,12 @@ static int soc_init_dai_link(struct snd_soc_card *card,
 {
        int i, ret;
 
+       ret = snd_soc_init_platform(card, link);
+       if (ret) {
+               dev_err(card->dev, "ASoC: failed to init multiplatform\n");
+               return ret;
+       }
+
        ret = snd_soc_init_multicodec(card, link);
        if (ret) {
                dev_err(card->dev, "ASoC: failed to init multicodec\n");
@@ -1076,13 +1107,12 @@ static int soc_init_dai_link(struct snd_soc_card *card,
         * Platform may be specified by either name or OF node, but
         * can be left unspecified, and a dummy platform will be used.
         */
-       if (link->platform_name && link->platform_of_node) {
+       if (link->platform->name && link->platform->of_node) {
                dev_err(card->dev,
                        "ASoC: Both platform name/of_node are set for %s\n",
                        link->name);
                return -EINVAL;
        }
-
        /*
         * CPU device may be specified by either name or OF node, but
         * can be left unspecified, and will be matched based on DAI
@@ -1917,7 +1947,11 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
                                 card->dai_link[i].name);
 
                        /* override platform component */
-                       dai_link->platform_name = component->name;
+                       if (snd_soc_init_platform(card, dai_link) < 0) {
+                               dev_err(card->dev, "init platform error");
+                               continue;
+                       }
+                       dai_link->platform->name = component->name;
 
                        /* convert non BE into BE */
                        dai_link->no_pcm = 1;