diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
| commit | 3146089d235b304e665dc551472ae9cb9ab58572 (patch) | |
| tree | d1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/intel/boards/bxt_rt298.c | |
| parent | b5e806ae4ad81de66c334d3d333fa42f960fbbd1 (diff) | |
| parent | 7b6b0049e2b70d103adf1b7d0320802f70ddceca (diff) | |
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/intel/boards/bxt_rt298.c')
| -rw-r--r-- | sound/soc/intel/boards/bxt_rt298.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index 27308337ab12..e91057f83d20 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -21,6 +21,7 @@ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <sound/soc-acpi.h> #include <sound/jack.h> #include <sound/pcm_params.h> #include "../../codecs/hdac_hdmi.h" @@ -576,6 +577,9 @@ static int broxton_audio_probe(struct platform_device *pdev) struct bxt_rt286_private *ctx; struct snd_soc_card *card = (struct snd_soc_card *)pdev->id_entry->driver_data; + struct snd_soc_acpi_mach *mach; + const char *platform_name; + int ret; int i; for (i = 0; i < ARRAY_SIZE(broxton_rt298_dais); i++) { @@ -602,6 +606,15 @@ static int broxton_audio_probe(struct platform_device *pdev) card->dev = &pdev->dev; snd_soc_card_set_drvdata(card, ctx); + /* override plaform name, if required */ + mach = (&pdev->dev)->platform_data; + platform_name = mach->mach_params.platform; + + ret = snd_soc_fixup_dai_links_platform_name(card, + platform_name); + if (ret) + return ret; + return devm_snd_soc_register_card(&pdev->dev, card); } |