ASoC: simple-card-utils: multi support at asoc_simple_canonicalize_cpu/platform()

Current asoc_simple_canonicalize_cpu/platform() is assuming single CPU,
single Platform, but we want to support Multi support.
This patch is prepare for it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87im4swf8y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 78b6cf0194d2ff0f26c1df3aa9b7c7d98de76574..cccd9987a1b4e5eaf81f17c5a21e18f8ac1ad463 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -151,9 +151,10 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                        &(dai)->slots,          \
                                        &(dai)->slot_width);
 
-void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link);
-void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
-                                     int is_single_links);
+void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platforms,
+                                      struct snd_soc_dai_link_component *cpus);
+void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus,
+                                 int is_single_links);
 
 int asoc_simple_clean_reference(struct snd_soc_card *card);
 

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 145f8a19c9e88059c677dbb97f23cc78c253e084..e6b64fdbdc76a67798d6f793db9a4fe4b3718c70 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -226,6 +226,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
        struct asoc_simple_dai *dai;
        struct snd_soc_dai_link_component *cpus = dai_link->cpus;
        struct snd_soc_dai_link_component *codecs = dai_link->codecs;
+       struct snd_soc_dai_link_component *platforms = dai_link->platforms;
        int ret;
 
        port    = of_get_parent(ep);
@@ -276,8 +277,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
                        dai_link->no_pcm = 1;
 
                /* card->num_links includes Codec */
-               asoc_simple_canonicalize_cpu(dai_link, is_single_links);
-               asoc_simple_canonicalize_platform(dai_link);
+               asoc_simple_canonicalize_cpu(cpus, is_single_links);
+               asoc_simple_canonicalize_platform(platforms, cpus);
        } else {
                struct snd_soc_codec_conf *cconf;
 
@@ -405,8 +406,8 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
        dai_link->ops = &graph_ops;
        dai_link->init = asoc_simple_dai_init;
 
-       asoc_simple_canonicalize_cpu(dai_link, single_cpu);
-       asoc_simple_canonicalize_platform(dai_link);
+       asoc_simple_canonicalize_cpu(dai_link->cpus, single_cpu);
+       asoc_simple_canonicalize_platform(dai_link->platforms, dai_link->cpus);
 
        return 0;
 }

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 6efe3757eff88c4671ba836ae96ddb96a4657fca..a15956c25858d64a1c14bfa7221598ccaf4bd294 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -423,15 +423,16 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
 }
 EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
 
-void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
+void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platforms,
+                                      struct snd_soc_dai_link_component *cpus)
 {
        /* Assumes platform == cpu */
-       if (!dai_link->platforms->of_node)
-               dai_link->platforms->of_node = dai_link->cpus->of_node;
+       if (!platforms->of_node)
+               platforms->of_node = cpus->of_node;
 }
 EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);
 
-void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus,
                                  int is_single_links)
 {
        /*
@@ -444,7 +445,7 @@ void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
         *      fmt_multiple_name()
         */
        if (is_single_links)
-               dai_link->cpus->dai_name = NULL;
+               cpus->dai_name = NULL;
 }
 EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_cpu);
 

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 6a55b8672166f8b9624b27436c4d7c6cb0873362..06b2d6a7f48dd290c42f721c8200690a65718c80 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -124,6 +124,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
        struct asoc_simple_dai *dai;
        struct snd_soc_dai_link_component *cpus = dai_link->cpus;
        struct snd_soc_dai_link_component *codecs = dai_link->codecs;
+       struct snd_soc_dai_link_component *platforms = dai_link->platforms;
        struct device_node *top = dev->of_node;
        struct device_node *node = of_get_parent(np);
        char *prefix = "";
@@ -162,8 +163,8 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
                if (ret < 0)
                        goto out_put_node;
 
-               asoc_simple_canonicalize_cpu(dai_link, is_single_links);
-               asoc_simple_canonicalize_platform(dai_link);
+               asoc_simple_canonicalize_cpu(cpus, is_single_links);
+               asoc_simple_canonicalize_platform(platforms, cpus);
        } else {
                struct snd_soc_codec_conf *cconf;
 
@@ -298,8 +299,8 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
        dai_link->ops = &simple_ops;
        dai_link->init = asoc_simple_dai_init;
 
-       asoc_simple_canonicalize_cpu(dai_link, single_cpu);
-       asoc_simple_canonicalize_platform(dai_link);
+       asoc_simple_canonicalize_cpu(dai_link->cpus, single_cpu);
+       asoc_simple_canonicalize_platform(dai_link->platforms, dai_link->cpus);
 
 dai_link_of_err:
        of_node_put(plat);