diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2019-01-25 23:34:56 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-28 21:07:36 +0300 |
| commit | e87055d732e34d8f5fa95da686958b30a03da5b4 (patch) | |
| tree | 0c08ce8dc5e8fb45c292b8fe5df75cade342f2f5 /sound/soc/intel/boards/haswell.c | |
| parent | cb50358b83846e4dcb37137c431327c4dd68561b (diff) | |
| download | linux-e87055d732e34d8f5fa95da686958b30a03da5b4.tar.xz | |
ASoC: Intel: haswell: 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/haswell.c')
| -rw-r--r-- | sound/soc/intel/boards/haswell.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index a4022983a7ce..971226d42042 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -19,6 +19,7 @@ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <sound/soc-acpi.h> #include <sound/pcm_params.h> #include "../common/sst-dsp.h" @@ -189,8 +190,22 @@ static struct snd_soc_card haswell_rt5640 = { static int haswell_audio_probe(struct platform_device *pdev) { + struct snd_soc_acpi_mach *mach; + const char *platform_name = NULL; + int ret; + haswell_rt5640.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(&haswell_rt5640, + platform_name); + if (ret) + return ret; + return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640); } |