ASoC: audio-graph-scu-card: support snd_soc_dai_link_component style for codec

Current ASoC is supporting snd_soc_dai_link_component for binding,
it is more useful than current legacy style.
Currently only codec is supporting it as multicodec (= codecs).
CPU will support multi style in the future.
We want to have it on Platform too in the future.

If all Codec/CPU/Platform are replaced into snd_soc_dai_link_component
style, we can remove legacy complex style.
This patch supports snd_soc_dai_link_component style
for audio-graph-scu-card for codec.

[current]
struct snd_soc_dai_link {
	...
	*cpu_name;
	*cpu_of_node;
	*cpu_dai_name;

	*codec_name;
	*codec_of_node;
	*codec_dai_name;
	*codecs;
	num_codecs;

	*platform_name;
	*platform_of_node;
	...
}

[in the future]
struct snd_soc_dai_link {
	...
	*cpus
	num_cpus;

	*codecs;
	num_codecs;

	*platform;
	...
}

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

diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c
index 043938fece420c44dc33dba2fabc6e3931dd9d2d..eeb3c1975fe301b7aadc72d3c55e034a9abc0930 100644 (file)
--- a/sound/soc/generic/audio-graph-scu-card.c
+++ b/sound/soc/generic/audio-graph-scu-card.c
@@ -27,6 +27,7 @@ struct graph_card_data {
        struct snd_soc_codec_conf codec_conf;
        struct graph_dai_props {
                struct asoc_simple_dai dai;
+               struct snd_soc_dai_link_component codecs;
        } *dai_props;
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_card_data adata;
@@ -99,10 +100,13 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep,
        int ret;
 
        if (is_fe) {
+               struct snd_soc_dai_link_component *codecs;
+
                /* BE is dummy */
-               dai_link->codec_of_node         = NULL;
-               dai_link->codec_dai_name        = "snd-soc-dummy-dai";
-               dai_link->codec_name            = "snd-soc-dummy";
+               codecs                  = dai_link->codecs;
+               codecs->of_node         = NULL;
+               codecs->dai_name        = "snd-soc-dummy-dai";
+               codecs->name            = "snd-soc-dummy";
 
                /* FE settings */
                dai_link->dynamic               = 1;
@@ -145,13 +149,13 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep,
 
                ret = asoc_simple_card_set_dailink_name(dev, dai_link,
                                                        "be.%s",
-                                                       dai_link->codec_dai_name);
+                                                       dai_link->codecs->dai_name);
                if (ret < 0)
                        return ret;
 
                snd_soc_of_parse_audio_prefix(card,
                                              &priv->codec_conf,
-                                             dai_link->codec_of_node,
+                                             dai_link->codecs->of_node,
                                              "prefix");
        }
 
@@ -336,7 +340,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
        struct graph_dai_props *dai_props;
        struct device *dev = &pdev->dev;
        struct snd_soc_card *card;
-       int num, ret;
+       int num, ret, i;
 
        /* Allocate the private data and the DAI link array */
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -352,6 +356,17 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
        if (!dai_props || !dai_link)
                return -ENOMEM;
 
+       /*
+        * Use snd_soc_dai_link_component instead of legacy style
+        * It is codec only. but cpu/platform will be supported in the future.
+        * see
+        *      soc-core.c :: snd_soc_init_multicodec()
+        */
+       for (i = 0; i < num; i++) {
+               dai_link[i].codecs      = &dai_props[i].codecs;
+               dai_link[i].num_codecs  = 1;
+       }
+
        priv->dai_props                 = dai_props;
        priv->dai_link                  = dai_link;