diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2019-01-25 14:34:57 -0600 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-01-28 18:07:46 +0000 |
| commit | 2d067b2807f9d3381a37acef1b2f43682a868c7a (patch) | |
| tree | edf2ba8fa8bc3c257797bd597eac409def201a86 /sound/soc/intel/boards/broadwell.c | |
| parent | ASoC: Intel: haswell: platform name fixup support (diff) | |
| download | linux-dev-2d067b2807f9d3381a37acef1b2f43682a868c7a.tar.xz linux-dev-2d067b2807f9d3381a37acef1b2f43682a868c7a.zip | |
ASoC: Intel: broadwell: platform name fixup support
Add helper to override dailink platform name, if passed as parameter
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/broadwell.c')
| -rw-r--r-- | sound/soc/intel/boards/broadwell.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index 99f2a0156ae8..b86c746d9b7a 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -21,6 +21,7 @@ #include <sound/soc.h> #include <sound/jack.h> #include <sound/pcm_params.h> +#include <sound/soc-acpi.h> #include "../common/sst-dsp.h" #include "../haswell/sst-haswell-ipc.h" @@ -267,7 +268,22 @@ static struct snd_soc_card broadwell_rt286 = { static int broadwell_audio_probe(struct platform_device *pdev) { + struct snd_soc_acpi_mach *mach; + const char *platform_name = NULL; + int ret; + broadwell_rt286.dev = &pdev->dev; + + /* override plaform name, if required */ + mach = (&pdev->dev)->platform_data; + if (mach) /* extra check since legacy does not pass parameters */ + platform_name = mach->mach_params.platform; + + ret = snd_soc_fixup_dai_links_platform_name(&broadwell_rt286, + platform_name); + if (ret) + return ret; + return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286); } |