Skip to content

ASoC: intel: sof_rt5682: set platform name for dai links #629

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

Merged
plbossart merged 1 commit into from
Feb 7, 2019
Merged

ASoC: intel: sof_rt5682: set platform name for dai links #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion sound/soc/intel/boards/sof_rt5682.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/rt5682.h>
#include <sound/soc-acpi.h>
#include "../../codecs/rt5682.h"
#include "../../codecs/hdac_hdmi.h"

Expand Down Expand Up @@ -189,7 +190,8 @@ static struct snd_soc_ops sof_rt5682_ops = {

static struct snd_soc_dai_link_component platform_component[] = {
{
.name = "sof-audio"
/* name might be overridden during probe */
.name = "0000:00:1f.3"
}
};

Expand Down Expand Up @@ -346,8 +348,10 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
static int sof_audio_probe(struct platform_device *pdev)
{
struct snd_soc_dai_link *dai_links;
struct snd_soc_acpi_mach *mach;
struct sof_card_private *ctx;
int dmic_num, hdmi_num;
int ret;

ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
if (!ctx)
Expand Down Expand Up @@ -378,6 +382,14 @@ static int sof_audio_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&ctx->hdmi_pcm_list);

sof_audio_card_rt5682.dev = &pdev->dev;
mach = (&pdev->dev)->platform_data;

/* set platform name for each dailink */
ret = snd_soc_fixup_dai_links_platform_name(&sof_audio_card_rt5682,
mach->mach_params.platform);
if (ret)
return ret;

snd_soc_card_set_drvdata(&sof_audio_card_rt5682, ctx);

return devm_snd_soc_register_card(&pdev->dev,
Expand Down