Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7e40ddcf authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: bdw-rt5677: platform name fixup support 



Add helper to override dailink platform name, if passed as parameter

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2d067b28

sound/soc/intel/boards/bdw-rt5677.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sound/soc.h>

#include <sound/soc.h>

#include <sound/pcm_params.h>

#include <sound/pcm_params.h>

#include <sound/jack.h>

#include <sound/jack.h>

#include <sound/soc-acpi.h>





#include "../common/sst-dsp.h"

#include "../common/sst-dsp.h"

#include "../haswell/sst-haswell-ipc.h"

#include "../haswell/sst-haswell-ipc.h"
@@ -339,6 +340,9 @@ static struct snd_soc_card bdw_rt5677_card = { 
static int bdw_rt5677_probe(struct platform_device *pdev)

static int bdw_rt5677_probe(struct platform_device *pdev)

{

{

	struct bdw_rt5677_priv *bdw_rt5677;

	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;

	bdw_rt5677_card.dev = &pdev->dev;
@@ -350,6 +354,16 @@ static int bdw_rt5677_probe(struct platform_device *pdev) 
		return -ENOMEM;

		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);

	snd_soc_card_set_drvdata(&bdw_rt5677_card, bdw_rt5677);





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

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