UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Pierre-Louis Bossart 2019-01-25 14:34:56 -06:00 committed by Mark Brown
parent cb50358b83
commit e87055d732
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/intel/boards/haswell.c
View File

@ -19,6 +19,7 @@
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-acpi.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include "../common/sst-dsp.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) 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; 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); return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640);
} }