nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ASoC: simple-card-utils: alloc dai_link information for CPU/Codec/Platform

Browse source 
simple-card / audio-graph are assuming single CPU/Codec/Platform on
dai_link. Because of it, it is difficult to support Multi-CPU/Codec.

This patch allocs CPU/Codec/Platform dai_link imformation
instead of using existing props information. It can update to
multi-CPU/Codec, but is still assuming single-CPU/Codec for now.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87blb61tpv.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2021-03-26 12:26:06 +09:00 committed by Mark Brown
parent 89503d736e
commit 050c7950fd
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 15 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
include/sound/simple_card_utils.h
View file

@ -43,9 +43,9 @@ struct asoc_simple_priv {
struct simple_dai_props { struct simple_dai_props {
struct asoc_simple_dai *cpu_dai; struct asoc_simple_dai *cpu_dai;
struct asoc_simple_dai *codec_dai; struct asoc_simple_dai *codec_dai;
struct snd_soc_dai_link_component cpus; /* single cpu */ struct snd_soc_dai_link_component *cpus;
struct snd_soc_dai_link_component codecs; /* single codec */ struct snd_soc_dai_link_component *codecs;
struct snd_soc_dai_link_component platforms; struct snd_soc_dai_link_component *platforms;
struct asoc_simple_data adata; struct asoc_simple_data adata;
struct snd_soc_codec_conf *codec_conf; struct snd_soc_codec_conf *codec_conf;
unsigned int mclk_fs; unsigned int mclk_fs;
@ -54,6 +54,7 @@ struct asoc_simple_priv {
struct asoc_simple_jack mic_jack; struct asoc_simple_jack mic_jack;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct asoc_simple_dai *dais; struct asoc_simple_dai *dais;
struct snd_soc_dai_link_component *dlcs;
struct snd_soc_codec_conf *codec_conf; struct snd_soc_codec_conf *codec_conf;
struct gpio_desc *pa_gpio; struct gpio_desc *pa_gpio;
const struct snd_soc_ops *ops; const struct snd_soc_ops *ops;

15
sound/soc/generic/simple-card-utils.c
View file

@ -601,13 +601,15 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct simple_dai_props *dai_props; struct simple_dai_props *dai_props;
struct asoc_simple_dai *dais; struct asoc_simple_dai *dais;
struct snd_soc_dai_link_component *dlcs;
struct snd_soc_codec_conf *cconf = NULL; struct snd_soc_codec_conf *cconf = NULL;
int i; int i;
dai_props = devm_kcalloc(dev, li->link, sizeof(*dai_props), GFP_KERNEL); dai_props = devm_kcalloc(dev, li->link, sizeof(*dai_props), GFP_KERNEL);
dai_link = devm_kcalloc(dev, li->link, sizeof(*dai_link), GFP_KERNEL); dai_link = devm_kcalloc(dev, li->link, sizeof(*dai_link), GFP_KERNEL);
dais = devm_kcalloc(dev, li->dais, sizeof(*dais), GFP_KERNEL); dais = devm_kcalloc(dev, li->dais, sizeof(*dais), GFP_KERNEL);
if (!dai_props || !dai_link || !dais) dlcs = devm_kcalloc(dev, li->link * 3, sizeof(*dai_props), GFP_KERNEL);
if (!dai_props || !dai_link || !dais || !dlcs)
return -ENOMEM; return -ENOMEM;
if (li->conf) { if (li->conf) {
@ -622,17 +624,22 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
* simple-card-utils.c :: asoc_simple_canonicalize_platform() * simple-card-utils.c :: asoc_simple_canonicalize_platform()
*/ */
for (i = 0; i < li->link; i++) { for (i = 0; i < li->link; i++) {
dai_link[i].cpus = &dai_props[i].cpus; dai_props[i].cpus = dlcs + (3 * i) + 0;
dai_props[i].codecs = dlcs + (3 * i) + 1;
dai_props[i].platforms = dlcs + (3 * i) + 2;
dai_link[i].cpus = dai_props[i].cpus;
dai_link[i].num_cpus = 1; dai_link[i].num_cpus = 1;
dai_link[i].codecs = &dai_props[i].codecs; dai_link[i].codecs = dai_props[i].codecs;
dai_link[i].num_codecs = 1; dai_link[i].num_codecs = 1;
dai_link[i].platforms = &dai_props[i].platforms; dai_link[i].platforms = dai_props[i].platforms;
dai_link[i].num_platforms = 1; dai_link[i].num_platforms = 1;
} }
priv->dai_props = dai_props; priv->dai_props = dai_props;
priv->dai_link = dai_link; priv->dai_link = dai_link;
priv->dais = dais; priv->dais = dais;
priv->dlcs = dlcs;
priv->codec_conf = cconf; priv->codec_conf = cconf;
card->dai_link = priv->dai_link; card->dai_link = priv->dai_link;