ASoC: simple-card-utils.c: enable multi Component support

If CPU/Codec driver keeps its DAI node, we can directly identify actual
DAI by using snd_soc_get_dai_via_args().
This means we can use multi Component.

This patch enables multi Component support on Audio Graph Card/Card2.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a5w4o949.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 b450d587322745bc9ed57d35b216f2d2915de58a..d1a95bc33c5697bfd2e1b99c83550fad55980a9d 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -192,9 +192,8 @@ int asoc_simple_remove(struct platform_device *pdev);
 
 int asoc_graph_card_probe(struct snd_soc_card *card);
 int asoc_graph_is_ports0(struct device_node *port);
-int asoc_graph_parse_dai(struct device_node *ep,
-                        struct snd_soc_dai_link_component *dlc,
-                        int *is_single_link);
+int asoc_graph_parse_dai(struct device *dev, struct device_node *ep,
+                        struct snd_soc_dai_link_component *dlc, int *is_single_link);
 
 #ifdef DEBUG
 static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index c6e0f91321930e9239606469b2f5cd0f2321bc78..0b8258b6bd8e6d09fc9553d5598632f71e18d0d2 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -126,7 +126,7 @@ static int graph_parse_node(struct asoc_simple_priv *priv,
 
        graph_parse_mclk_fs(top, ep, dai_props);
 
-       ret = asoc_graph_parse_dai(ep, dlc, cpu);
+       ret = asoc_graph_parse_dai(dev, ep, dlc, cpu);
        if (ret < 0)
                return ret;
 

diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 542c4a1149403a2023bd4f50e8473ae4f5f76548..98732468a992cacf04b29684b85de6ea8998cb8d 100644 (file)
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -407,7 +407,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv,
 
        graph_parse_mclk_fs(ep, dai_props);
 
-       ret = asoc_graph_parse_dai(ep, dlc, &is_single_links);
+       ret = asoc_graph_parse_dai(dev, ep, dlc, &is_single_links);
        if (ret < 0)
                return ret;
 

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index c142571992a1c3e6b840d7f0c123994787d21096..5b18a4af022f19a1c14cf734f1df0f1f8609f64d 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1066,12 +1066,12 @@ static int graph_get_dai_id(struct device_node *ep)
        return id;
 }
 
-int asoc_graph_parse_dai(struct device_node *ep,
-                        struct snd_soc_dai_link_component *dlc,
-                        int *is_single_link)
+int asoc_graph_parse_dai(struct device *dev, struct device_node *ep,
+                        struct snd_soc_dai_link_component *dlc, int *is_single_link)
 {
        struct device_node *node;
        struct of_phandle_args args = {};
+       struct snd_soc_dai *dai;
        int ret;
 
        if (!ep)
@@ -1079,6 +1079,20 @@ int asoc_graph_parse_dai(struct device_node *ep,
 
        node = of_graph_get_port_parent(ep);
 
+       /*
+        * Try to find from DAI node
+        */
+       args.np = ep;
+       dai = snd_soc_get_dai_via_args(&args);
+       if (dai) {
+               dlc->dai_name = snd_soc_dai_name_get(dai);
+               dlc->dai_args = snd_soc_copy_dai_args(dev, &args);
+               if (!dlc->dai_args)
+                       return -ENOMEM;
+
+               goto parse_dai_end;
+       }
+
        /* Get dai->name */
        args.np         = node;
        args.args[0]    = graph_get_dai_id(ep);
@@ -1109,6 +1123,7 @@ int asoc_graph_parse_dai(struct device_node *ep,
                return ret;
        }
 
+parse_dai_end:
        if (is_single_link)
                *is_single_link = of_graph_get_endpoint_count(node) == 1;