hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: audio-graph-scu-card: care multi DPCM codec_conf 

Current audio-graph-scu-card didn't care about codec_conf
for multi DPCM case. This patch cares it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-11-30 02:07:32 +00:00 committed by Mark Brown
parent a1af9858ed
commit 7c2ae7981d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/soc/generic/audio-graph-scu-card.c
View File

@ -24,17 +24,18 @@
struct graph_card_data { struct graph_card_data {
struct snd_soc_card snd_card; struct snd_soc_card snd_card;
struct snd_soc_codec_conf codec_conf;
struct graph_dai_props { struct graph_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 codecs; struct snd_soc_dai_link_component codecs;
struct snd_soc_dai_link_component platform; struct snd_soc_dai_link_component platform;
struct asoc_simple_card_data adata; struct asoc_simple_card_data adata;
struct snd_soc_codec_conf *codec_conf;
} *dai_props; } *dai_props;
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 asoc_simple_card_data adata; struct asoc_simple_card_data adata;
struct snd_soc_codec_conf *codec_conf;
}; };
#define graph_priv_to_card(priv) (&(priv)->snd_card) #define graph_priv_to_card(priv) (&(priv)->snd_card)
@ -114,7 +115,8 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep, static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct graph_card_data *priv, struct graph_card_data *priv,
int *dai_idx, int link_idx, int is_fe) int *dai_idx, int link_idx,
int *conf_idx, int is_fe)
{ {
struct device *dev = graph_priv_to_dev(priv); struct device *dev = graph_priv_to_dev(priv);
struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, link_idx); struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, link_idx);
@ -159,6 +161,8 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,
asoc_simple_card_canonicalize_cpu(dai_link, asoc_simple_card_canonicalize_cpu(dai_link,
of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1); of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1);
} else { } else {
struct snd_soc_codec_conf *cconf;
/* FE is dummy */ /* FE is dummy */
dai_link->cpu_of_node = NULL; dai_link->cpu_of_node = NULL;
dai_link->cpu_dai_name = "snd-soc-dummy-dai"; dai_link->cpu_dai_name = "snd-soc-dummy-dai";
@ -171,6 +175,9 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,
dai = dai =
dai_props->codec_dai = &priv->dais[(*dai_idx)++]; dai_props->codec_dai = &priv->dais[(*dai_idx)++];
cconf =
dai_props->codec_conf = &priv->codec_conf[(*conf_idx)++];
ret = asoc_simple_card_parse_graph_codec(ep, dai_link); ret = asoc_simple_card_parse_graph_codec(ep, dai_link);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -186,14 +193,12 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,
return ret; return ret;
/* check "prefix" from top node */ /* check "prefix" from top node */
snd_soc_of_parse_audio_prefix(card, snd_soc_of_parse_audio_prefix(card, cconf,
&priv->codec_conf,
dai_link->codecs->of_node, dai_link->codecs->of_node,
"prefix"); "prefix");
/* check "prefix" from each node if top doesn't have */ /* check "prefix" from each node if top doesn't have */
if (!priv->codec_conf.of_node) if (!cconf->of_node)
snd_soc_of_parse_node_prefix(node, snd_soc_of_parse_node_prefix(node, cconf,
&priv->codec_conf,
dai_link->codecs->of_node, dai_link->codecs->of_node,
PREFIX "prefix"); PREFIX "prefix");
} }
@ -232,7 +237,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
struct device_node *codec_ep; struct device_node *codec_ep;
struct device_node *codec_port; struct device_node *codec_port;
struct device_node *codec_port_old; struct device_node *codec_port_old;
int dai_idx, link_idx, ret; int dai_idx, link_idx, conf_idx, ret;
int rc, codec; int rc, codec;
if (!node) if (!node)
@ -256,6 +261,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
link_idx = 0; link_idx = 0;
dai_idx = 0; dai_idx = 0;
conf_idx = 0;
codec_port_old = NULL; codec_port_old = NULL;
for (codec = 0; codec < 2; codec++) { for (codec = 0; codec < 2; codec++) {
/* /*
@ -284,7 +290,8 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
ret = asoc_graph_card_dai_link_of(cpu_ep, codec_ep, ret = asoc_graph_card_dai_link_of(cpu_ep, codec_ep,
priv, &dai_idx, priv, &dai_idx,
link_idx++, !codec); link_idx++, &conf_idx,
!codec);
if (ret < 0) if (ret < 0)
goto parse_of_err; goto parse_of_err;
} }
@ -294,6 +301,14 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
if (ret) if (ret)
goto parse_of_err; goto parse_of_err;
if ((card->num_links != link_idx) ||
(card->num_configs != conf_idx)) {
dev_err(dev, "dai_link or codec_config wrong (%d/%d, %d/%d)\n",
card->num_links, link_idx, card->num_configs, conf_idx);
ret = -EINVAL;
goto parse_of_err;
}
ret = 0; ret = 0;
parse_of_err: parse_of_err:
@ -390,6 +405,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
struct asoc_simple_dai *dais; struct asoc_simple_dai *dais;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct snd_soc_card *card; struct snd_soc_card *card;
struct snd_soc_codec_conf *cconf;
int lnum = 0, dnum = 0, cnum = 0; int lnum = 0, dnum = 0, cnum = 0;
int ret, i; int ret, i;
@ -405,6 +421,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
dai_props = devm_kcalloc(dev, lnum, sizeof(*dai_props), GFP_KERNEL); dai_props = devm_kcalloc(dev, lnum, sizeof(*dai_props), GFP_KERNEL);
dai_link = devm_kcalloc(dev, lnum, sizeof(*dai_link), GFP_KERNEL); dai_link = devm_kcalloc(dev, lnum, sizeof(*dai_link), GFP_KERNEL);
dais = devm_kcalloc(dev, dnum, sizeof(*dais), GFP_KERNEL); dais = devm_kcalloc(dev, dnum, sizeof(*dais), GFP_KERNEL);
cconf = devm_kcalloc(dev, cnum, sizeof(*cconf), GFP_KERNEL);
if (!dai_props || !dai_link || !dais) if (!dai_props || !dai_link || !dais)
return -ENOMEM; return -ENOMEM;
@ -423,6 +440,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
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->codec_conf = cconf;
/* Init snd_soc_card */ /* Init snd_soc_card */
card = graph_priv_to_card(priv); card = graph_priv_to_card(priv);
@ -430,8 +448,8 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
card->dev = dev; card->dev = dev;
card->dai_link = priv->dai_link; card->dai_link = priv->dai_link;
card->num_links = lnum; card->num_links = lnum;
card->codec_conf = &priv->codec_conf; card->codec_conf = cconf;
card->num_configs = 1; card->num_configs = cnum;
ret = asoc_graph_card_parse_of(priv); ret = asoc_graph_card_parse_of(priv);
if (ret < 0) { if (ret < 0) {