Skip to content

Commit

Permalink
ASoC: Intel: haswell: platform name fixup support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
plbossart authored and broonie committed Jan 28, 2019
1 parent cb50358 commit e87055d
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions sound/soc/intel/boards/haswell.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit e87055d

Please sign in to comment.