Skip to content

Commit

Permalink
ASoC: Intel: bdw-rt5677: 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 <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
plbossart authored and broonie committed Jan 28, 2019
1 parent 2d067b2 commit 7e40ddc
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions sound/soc/intel/boards/bdw-rt5677.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include <sound/jack.h>
#include <sound/soc-acpi.h>

#include "../common/sst-dsp.h"
#include "../haswell/sst-haswell-ipc.h"
Expand Down Expand Up @@ -339,6 +340,9 @@ static struct snd_soc_card bdw_rt5677_card = {
static int bdw_rt5677_probe(struct platform_device *pdev)
{
struct bdw_rt5677_priv *bdw_rt5677;
struct snd_soc_acpi_mach *mach;
const char *platform_name = NULL;
int ret;

bdw_rt5677_card.dev = &pdev->dev;

Expand All @@ -350,6 +354,16 @@ static int bdw_rt5677_probe(struct platform_device *pdev)
return -ENOMEM;
}

/* 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(&bdw_rt5677_card,
platform_name);
if (ret)
return ret;

snd_soc_card_set_drvdata(&bdw_rt5677_card, bdw_rt5677);

return devm_snd_soc_register_card(&pdev->dev, &bdw_rt5677_card);
Expand Down

0 comments on commit 7e40ddc

Please sign in to comment.