Commit 5930d02c authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
parent db8cfae8
...@@ -411,10 +411,16 @@ static int create_codec_dai_name(struct device *dev, ...@@ -411,10 +411,16 @@ static int create_codec_dai_name(struct device *dev,
static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link, static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
bool playback) bool playback, int group_id)
{ {
int i; int i;
do {
/*
* Initialize the codec. If codec is part of an aggregated
* group (group_id>0), initialize all codecs belonging to
* same group.
*/
for (i = 0; i < link->num_adr; i++) { for (i = 0; i < link->num_adr; i++) {
unsigned int part_id; unsigned int part_id;
int codec_index; int codec_index;
...@@ -424,12 +430,17 @@ static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link, ...@@ -424,12 +430,17 @@ static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link,
if (codec_index < 0) if (codec_index < 0)
return codec_index; return codec_index;
/* The group_id is > 0 iff the codec is aggregated */
if (link->adr_d[i].endpoints->group_id != group_id)
continue;
if (codec_info_list[codec_index].init) if (codec_info_list[codec_index].init)
codec_info_list[codec_index].init(link, dai_links, codec_info_list[codec_index].init(link,
dai_links,
&codec_info_list[codec_index], &codec_info_list[codec_index],
playback); playback);
} }
link++;
} while (link->mask && group_id);
return 0; return 0;
} }
...@@ -623,7 +634,7 @@ static int create_sdw_dailink(struct device *dev, int *be_index, ...@@ -623,7 +634,7 @@ static int create_sdw_dailink(struct device *dev, int *be_index,
NULL, &sdw_ops); NULL, &sdw_ops);
ret = set_codec_init_func(link, dai_links + (*be_index)++, ret = set_codec_init_func(link, dai_links + (*be_index)++,
playback); playback, group_id);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to init codec %d", codec_index); dev_err(dev, "failed to init codec %d", codec_index);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment