Skip to content

Commit

Permalink
ASoC: Intel: cht_bsw_nau8824: 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
Pierre-Louis Bossart authored and Mark Brown committed Jan 28, 2019
1 parent 7e7e24d commit 4506db8
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions sound/soc/intel/boards/cht_bsw_nau8824.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/soc-acpi.h>
#include <sound/jack.h>
#include <linux/input.h>
#include "../atom/sst-atom-controls.h"
Expand Down Expand Up @@ -246,13 +247,24 @@ static struct snd_soc_card snd_soc_card_cht = {
static int snd_cht_mc_probe(struct platform_device *pdev)
{
struct cht_mc_private *drv;
struct snd_soc_acpi_mach *mach;
const char *platform_name;
int ret_val;

drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
if (!drv)
return -ENOMEM;
snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);

/* override plaform name, if required */
mach = (&pdev->dev)->platform_data;
platform_name = mach->mach_params.platform;

ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,
platform_name);
if (ret_val)
return ret_val;

/* register the soc card */
snd_soc_card_cht.dev = &pdev->dev;
ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
Expand Down

0 comments on commit 4506db8

Please sign in to comment.