]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: audio-graph-card: support snd_soc_dai_link_component style for platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 31 Aug 2018 03:10:58 +0000 (03:10 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 31 Aug 2018 14:58:54 +0000 (15:58 +0100)
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-card for platform.

[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>
sound/soc/generic/audio-graph-card.c

index 5b2ecf8c26527687a22085e80a81c6ea9ad87f4a..fb6635f8d5d7df68d996002299420432a7e2055d 100644 (file)
@@ -26,6 +26,7 @@ struct graph_card_data {
                struct asoc_simple_dai cpu_dai;
                struct asoc_simple_dai codec_dai;
                struct snd_soc_dai_link_component codecs; /* single codec */
+               struct snd_soc_dai_link_component platform;
                unsigned int mclk_fs;
        } *dai_props;
        unsigned int mclk_fs;
@@ -325,6 +326,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
        for (i = 0; i < num; i++) {
                dai_link[i].codecs      = &dai_props[i].codecs;
                dai_link[i].num_codecs  = 1;
+               dai_link[i].platform    = &dai_props[i].platform;
        }
 
        priv->pa_gpio = devm_gpiod_get_optional(dev, "pa", GPIOD_OUT_LOW);