Skip to content

ASoC: intel: cml_rt1011_rt5682: find dai link with dai link name #2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bardliao wants to merge 2 commits into from
Closed

ASoC: intel: cml_rt1011_rt5682: find dai link with dai link name #2174

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58476a5
ASoC: intel: cml_rt1011_rt5682: find dai link with dai link name
bardliao Jun 7, 2020
4521c21
ASoC: intel: cml_rt1011_rt5682: use for_each_card_prelinks
bardliao Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sound/soc/intel/boards/cml_rt1011_rt5682.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev)
{
struct snd_soc_dai_link_component *rt1011_dais_components;
struct snd_soc_codec_conf *rt1011_dais_confs;
struct snd_soc_dai_link *dai_link;
struct card_private *ctx;
struct snd_soc_acpi_mach *mach;
const char *platform_name;
Expand Down Expand Up @@ -583,11 +584,10 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev)
snd_soc_card_cml.codec_conf = rt1011_dais_confs;
snd_soc_card_cml.num_configs = SPK_CH;

for (i = 0; i < ARRAY_SIZE(cml_rt1011_rt5682_dailink); i++) {
if (!strcmp(cml_rt1011_rt5682_dailink[i].codecs->dai_name,
CML_RT1011_CODEC_DAI)) {
cml_rt1011_rt5682_dailink[i].codecs = rt1011_dais_components;
cml_rt1011_rt5682_dailink[i].num_codecs = SPK_CH;
for_each_card_prelinks(&snd_soc_card_cml, i, dai_link) {
if (!strcmp(dai_link->name, "SSP1-Codec")) {
dai_link->codecs = rt1011_dais_components;
dai_link->num_codecs = SPK_CH;
}
}
}
Expand Down